[GRASS-SVN] r60089 - grass-addons/tools

[svn_grass at osgeo.org]

Author: hamish
Date: 2014-05-04 18:46:28 -0700 (Sun, 04 May 2014)
New Revision: 60089

Added:
   grass-addons/tools/svn70merge
Log:
helper script to make merging FROM relbr70 easy

Copied: grass-addons/tools/svn70merge (from rev 60087, grass-addons/tools/svn7merge)
===================================================================
--- grass-addons/tools/svn70merge	                        (rev 0)
+++ grass-addons/tools/svn70merge	2014-05-05 01:46:28 UTC (rev 60089)
@@ -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/branches/releasebranch_7_0
+else
+  echo "usage: cd grass65; svn70merge rev_number"
+fi