Changes between Version 14 and Version 15 of HowToBackport

Timestamp:

Apr 14, 2013, 3:50:47 AM (11 years ago)

Author:

hamish

Comment:

merge tips

HowToBackport

@@ -20 +20 @@
 If the above is unclear, it should be discussed on the developers list. '''If in doubt, ask! '''
 In this case, a path/diff is appreciated.
+
+== Hints ==
+
+Three little scripts to make merging between branches easier:
+ * [browser:grass-addons/tools/svn64merge]
+ * [browser:grass-addons/tools/svn65merge]
+ * [browser:grass-addons/tools/svn7merge]
+
+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 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'.
 
 == Comparing branches ==