Changes between Version 67 and Version 68 of HowToSVN

Timestamp:

Jun 21, 2017, 2:25:37 PM (7 years ago)

Author:

neteler

Comment:

point to separate HowToBackport

HowToSVN

@@ -205 +205 @@
 === Merge between branches (backporting) ===
 
-Run the command from within the target branch.
- * Example 1: pull a change from trunk into the 7.2 release branch:
-{{{
-cd releasebranch_7_2/
-svn up raster/r.digit/
-svn merge -c 30749 https://svn.osgeo.org/grass/grass/trunk
-svn diff raster/r.digit/main.c
-svn commit raster/r.digit/main.c -m "fix bug #456: unsafe quoting (merge from trunk, r30749)"
-}}}
-
-where {{{30749}}} is the revision number of the changeset you wish to backport.
-
- * Example 2: merge a change from the old 6.4 release branch into GRASS 7 (trunk):
-{{{
-cd trunk/
-svn up raster/r.digit/
-svn merge -c 31154 https://svn.osgeo.org/grass/grass/branches/releasebranch_6_4
-svn diff raster/r.digit/main.c
-svn commit raster/r.digit/main.c -m"clean up help page, option descriptions (merge from relbr64, r31154)"
+Please see **[[wiki:HowToBackport]] for the procedure**.
+
+
+''Old style (not recommended):''
+
+~~Run the command from within the target branch.~~
+ * ~~Example 1: pull a change from trunk into the 7.2 release branch:~~
+{{{
+### OLD STYLE, see above for modern style
+#cd releasebranch_7_2/
+#svn up raster/r.digit/
+#svn merge -c 30749 https://svn.osgeo.org/grass/grass/trunk
+#svn diff raster/r.digit/main.c
+#svn commit raster/r.digit/main.c -m "fix bug #456: unsafe quoting (merge from trunk, r30749)"
+}}}
+
+~~where {{{30749}}} is the revision number of the changeset you wish to backport.~~
+
+ * ~~Example 2: merge a change from the old 6.4 release branch into GRASS 7 (trunk):~~
+{{{
+### OLD STYLE, see above for modern style
+#cd trunk/
+#svn up raster/r.digit/
+#svn merge -c 31154 https://svn.osgeo.org/grass/grass/branches/releasebranch_6_4
+#svn diff raster/r.digit/main.c
+#svn commit raster/r.digit/main.c -m"clean up help page, option descriptions (merge from relbr64, r31154)"
 }}}