Changes between Version 10 and Version 11 of HowToSVN

Timestamp:

Apr 28, 2008, 1:30:02 AM (16 years ago)

Author:

hamish

Comment:

backport hint

HowToSVN

@@ -13 +13 @@
     svn log [file.c] | tac
 }}}
+
+ * Bug: svn2cl !ChangeLog loses file names branch point
+http://article.gmane.org/gmane.comp.gis.grass.devel/26626/
+http://article.gmane.org/gmane.comp.gis.grass.devel/26631
 
 == Switch the repository ==
@@ -29 +33 @@
  * http://svnbook.red-bean.com/
 
+=== Merge between branches (backporting) ===
+
+Run the command from within the target branch.
+ * Example 1: pull a change from trunk into the 6.3 release branch:
+{{{
+    cd releasebranch_6_3/
+    svn merge -c 30749 https://svn.osgeo.org/grass/grass/trunk
+}}}
+
+where {{{30749}}} is the revision number of the changeset you wish to backport.
+
+ * Example 2: merge a change from the 6.4 development branch into GRASS 7 (trunk):
+{{{
+    cd trunk/
+    svn merge -c 31154 https://svn.osgeo.org/grass/grass/branches/develbranch_6
+
+}}}
+
+
+
 == See Also ==