Changes between Version 15 and Version 16 of HowToBackport

Timestamp:

Apr 14, 2013, 3:55:19 AM (11 years ago)

Author:

hamish

Comment:

example

HowToBackport

@@ -29 +29 @@
 
 To use them, first make sure all branches are up to date (`svn up`) and clean (`svn diff`),
-then `cd` into the top of the source tree you want to ''pull '''in''' to''. If you try to run it from the module's own subdir it will fail.
+then `cd` into the '''top''' of the source tree you want to ''pull '''in''' to''. If you try to run it from the module's own subdir it will fail.
 Then run the script named for the branch you want to pull ''from'', followed by the revision number of the change you wish to merge (no leading "r" or [square brackets] around the rev number please). Mind that you might want to run '`svn propdel svn:mergeinfo .`' before doing an untargeted 'svn commit'.
 
+Example:
+{{{
+ # make the original edit
+ cd devbr6
+ svn diff lib/gis/parser.c
+ svn up lib/gis/parser.c
+ vi 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
+
+ # now backport it
+ cd ../relbr64
+ svn diff lib/gis/parser.c
+ svn up lib/gis/parser.c
+ svn65merge 54321
+ svn diff lib/gis/parser.c
+ # .. run make; test the change ..
+ svn commit lib/gis/parser.c
+}}}
 == Comparing branches ==