[GRASS-SVN] r55245 - grass-addons/grass7/tools

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-02-27 11:40:19 -0800 (Wed, 27 Feb 2013)
New Revision: 55245

Added:
   grass-addons/grass7/tools/svn7merge
Log:
+ helper script to make backporting changes from trunk easier

Added: grass-addons/grass7/tools/svn7merge
===================================================================
--- grass-addons/grass7/tools/svn7merge	                        (rev 0)
+++ grass-addons/grass7/tools/svn7merge	2013-02-27 19:40:19 UTC (rev 55245)
@@ -0,0 +1,15 @@
+#!/bin/sh
+# script to make backporting easier: this one _pulls from_ trunk.
+#
+#  by Hamish Bowman, Feb 2011; released to the public domain
+#
+# pulls a recent change from trunk into another branch by rev number
+# you should be in the top source dir of the branch you are pulling
+# into. mind that you might want to run 'svn propdel svn:mergeinfo .'
+# before doing an untargeted 'svn commit'.
+
+if [ $# -eq 1 ] ; then
+  svn merge -c $1 https://svn.osgeo.org/grass/grass/trunk
+else
+  echo "usage: cd grass65; svn7merge rev_number"
+fi


Property changes on: grass-addons/grass7/tools/svn7merge
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + text/x-sh
Added: svn:eol-style
   + native