Author: bugman Date: Sun May 4 20:46:20 2008 New Revision: 6107 URL: http://svn.gna.org/viewcvs/relax?rev=6107&view=rev Log: Merged revisions 6104 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r6104 | bugman | 2008-05-04 16:01:44 +0200 (Sun, 04 May 2008) | 5 lines Updated the branch management section of the relax manual. A commit instruction was missing. ........ Modified: 1.2/ (props changed) 1.2/docs/latex/develop.tex Propchange: 1.2/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Sun May 4 20:46:20 2008 @@ -1,1 +1,1 @@ -/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318,3345,3372,4145,4473,4476,4939,5117,5255,5396-5398,5462-5465,5611-5612,5622,5663,5971,6020-6023,6025,6033,6041,6044 +/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318,3345,3372,4145,4473,4476,4939,5117,5255,5396-5398,5462-5465,5611-5612,5622,5663,5971,6020-6023,6025,6033,6041,6044,6104 Modified: 1.2/docs/latex/develop.tex URL: http://svn.gna.org/viewcvs/relax/1.2/docs/latex/develop.tex?rev=6107&r1=6106&r2=6107&view=diff ============================================================================== --- 1.2/docs/latex/develop.tex (original) +++ 1.2/docs/latex/develop.tex Sun May 4 20:46:20 2008 @@ -447,6 +447,11 @@ \index{Subversion!svnmerge.py uninit} \index{Subversion!merge} +the changes commited + +\example{\$ svn ci -F svnmerge-commit-message.txt} +\index{Subversion!commit} + and your private branch deleted \example{\$ svn rm svn+ssh://xxxxx@xxxxxxxxxxx/svn/relax/branches/molmol\_macros}