Changes between Version 28 and Version 29 of HowToBackport

Timestamp:

06/21/17 14:18:08 (8 years ago)

Author:

neteler

Comment:

finetuning of procedure

HowToBackport

@@ -25 +25 @@
 == Hints ==
 
-Three little scripts to make merging between branches easier:
+Two little helper scripts to make merging between branches easier:
  * [browser:grass-addons/tools/svn64merge]
- * [browser:grass-addons/tools/svn65merge]
- * [browser:grass-addons/tools/svn7merge]
- * [browser:grass-addons/tools/svn70merge]
+ * [browser:grass-addons/tools/svn-merge.sh] (recommended for any GRASS GIS 7 release branch)
 
 To use them, first make sure all branches are up to date (`svn up`) and clean (`svn diff`),
@@ -37 +35 @@
 Example:
 {{{
- # make the original edit
+ # make the original edit in trunk
  cd trunk
  svn diff lib/gis/parser.c
  svn up lib/gis/parser.c
- vi lib/gis/parser.c
+ vim lib/gis/parser.c
  svn diff lib/gis/parser.c
  # .. run make; test the change ..
- svn commit lib/gis/parser.c   # note the rev number of the commit
+ svn commit -m"libgis: fix of XYZW in parser" lib/gis/parser.c
+ # --> note the rev number of this commit for an immediate or future backport
 
- # now backport it
- cd ../relbr70
+
+ # backport fix to the appropriate release branch (e.g. GRASS GIS 7.2.x)
+ cd /path/to/grass72_release/
  svn diff lib/gis/parser.c
  svn up lib/gis/parser.c
- svn7merge 54321              # using the rev number from before
+ /path/to/grass-addons/tools/svn-merge.sh 12345   # using the rev number from above
  svn diff lib/gis/parser.c
  # .. run make; test the change ..
- svn commit lib/gis/parser.c
+ svn commit -m"libgis: fix of XYZW in parser (trunk, r12345)" lib/gis/parser.c
 }}}
 == Comparing branches ==