[Genabel-commits] r1994 - www

[noreply at r-forge.r-project.org]

Author: lckarssen
Date: 2015-06-16 15:14:53 +0200 (Tue, 16 Jun 2015)
New Revision: 1994

Modified:
   www/tutHowToMakeTags.html
Log:
Summary: Added some notes about merging a branch with trunk and v.v. to the developers webpages.


Modified: www/tutHowToMakeTags.html
===================================================================
--- www/tutHowToMakeTags.html	2015-06-04 11:04:04 UTC (rev 1993)
+++ www/tutHowToMakeTags.html	2015-06-16 13:14:53 UTC (rev 1994)
@@ -73,6 +73,18 @@
 with the changes in trunk. See
 the <a href="http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.stayinsync">SVN
   manual</a> for details on how to do this.
+In its simplest form it's a matter of:
+<pre>
+  $ svn merge -r XXX:YYY ^/pkg/YOURPACKAGE
+</pre>
+Here XXX is either the revision number when you started the branch or
+the revision number of your last merge. To find the revision number
+"at branch time" go into the branch directory and run the following to find all log messages with the word <i>branch</i>:
+<pre>
+$ svn log | grep -C3 branch
+</pre>
+YYY is the revision number of trunk (often the latest revision
+number). The ^ is a shorthand for the base URL of the repository.
 
 Once you are satisfied with your changes (and you have verified that
 they work as expected) you can merge your work with the main
@@ -80,7 +92,14 @@
 directory. Since this can cause a lot of trouble and because it is a
 good idea to discuss large changesets on the mailing list before
 merging them back into trunk I will not go into details on how to do
-that here.
+that here, but in short this is the procedure:
+<pre>
+$ cd pkg/YOURPACKAGE      # This is the trunk of your package
+$ svn merge -r XXX:YYY ^/branches/YOURBRANCH
+</pre>
+Here, XXX and YYY are defined as above. Currently, <i>svn merge
+--reintegrate</i> doesn't work on R-forge, because the repositories
+haven't been updated to the latest version of Subversion.
 
 <h4>
 Help