[GRASS-SVN] r55247 - in grass-addons: grass7/tools tools

[svn_grass at osgeo.org]

Author: hamish
Date: 2013-02-27 11:46:18 -0800 (Wed, 27 Feb 2013)
New Revision: 55247

Added:
   grass-addons/tools/svn64merge
   grass-addons/tools/svn65merge
   grass-addons/tools/svn7merge
Removed:
   grass-addons/grass7/tools/svn7merge
Log:
+ helper scripts to make cross-porting changes between branches easier

Deleted: grass-addons/grass7/tools/svn7merge
===================================================================
--- grass-addons/grass7/tools/svn7merge	2013-02-27 19:41:53 UTC (rev 55246)
+++ grass-addons/grass7/tools/svn7merge	2013-02-27 19:46:18 UTC (rev 55247)
@@ -1,15 +0,0 @@
-#!/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

Added: grass-addons/tools/svn64merge
===================================================================
--- grass-addons/tools/svn64merge	                        (rev 0)
+++ grass-addons/tools/svn64merge	2013-02-27 19:46:18 UTC (rev 55247)
@@ -0,0 +1,15 @@
+#!/bin/sh
+# script to make backporting easier: this one _pulls from_ releasebranch_6_4
+#
+#  by Hamish Bowman, Feb 2011; released to the public domain
+#
+# pulls a recent change from relbr64 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_6_4
+else
+  echo "usage: cd grass65; svn64merge rev_number"
+fi


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

Added: grass-addons/tools/svn65merge
===================================================================
--- grass-addons/tools/svn65merge	                        (rev 0)
+++ grass-addons/tools/svn65merge	2013-02-27 19:46:18 UTC (rev 55247)
@@ -0,0 +1,15 @@
+#!/bin/sh
+# script to make backporting easier: this one _pulls from_ develbranch_6.
+#
+#  by Hamish Bowman, Feb 2011; released to the public domain
+#
+# pulls a recent change from devbr6 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/develbranch_6
+else
+  echo "usage: cd grass7; svn65merge rev_number"
+fi


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

Copied: grass-addons/tools/svn7merge (from rev 55245, grass-addons/grass7/tools/svn7merge)
===================================================================
--- grass-addons/tools/svn7merge	                        (rev 0)
+++ grass-addons/tools/svn7merge	2013-02-27 19:46:18 UTC (rev 55247)
@@ -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