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

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-06-20 04:25:56 -0700 (Fri, 20 Jun 2014)
New Revision: 60885

Added:
   grass-addons/tools/svn-merge.sh
Log:
add alternative script for merging

Added: grass-addons/tools/svn-merge.sh
===================================================================
--- grass-addons/tools/svn-merge.sh	                        (rev 0)
+++ grass-addons/tools/svn-merge.sh	2014-06-20 11:25:56 UTC (rev 60885)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+#
+# Usage:
+#
+# merge from trunk
+# svn-merge.sh 60867
+#
+# merge from specified branch
+# svn-merge.sh 60867 releasebranch_6_4
+#
+# Author: Martin Landa <landa.martin gmail.com>
+#
+
+if test -z "$1" ; then
+    echo "$0 rev"
+    exit 1
+fi
+if test -z "$2" ; then
+    SVN_BRANCH=https://svn.osgeo.org/grass/grass/trunk
+else
+    SVN_BRANCH=https://svn.osgeo.org/grass/grass/branches/$2
+fi
+
+svn merge -c "$1" $SVN_BRANCH
+svn propdel svn:mergeinfo .
+
+exit 0


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