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

[svn_grass at osgeo.org]

Author: neteler
Date: 2015-12-30 06:23:22 -0800 (Wed, 30 Dec 2015)
New Revision: 67428

Modified:
   grass-addons/tools/svn7merge
Log:
svn7merge tool: not the preferred script. Added propdel

Modified: grass-addons/tools/svn7merge
===================================================================
--- grass-addons/tools/svn7merge	2015-12-30 14:21:47 UTC (rev 67427)
+++ grass-addons/tools/svn7merge	2015-12-30 14:23:22 UTC (rev 67428)
@@ -8,9 +8,18 @@
 # into. mind that you might want to run 'svn propdel svn:mergeinfo .'
 # before doing an untargeted 'svn commit'.
 
+echo ""
+echo "-->> NOTE: The preferred merge script is ./svn-merge.sh <<--"
+echo ""
+
 if [ $# -eq 1 ] ; then
   svn merge -c $1 https://svn.osgeo.org/grass/grass/trunk
 else
   echo "Merge: pull from trunk"
   echo "usage: cd grass70; svn7merge rev_number"
+  exit 1
 fi
+
+svn propdel svn:mergeinfo .
+
+exit 0