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

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-06-07 15:15:23 -0700 (Sat, 07 Jun 2014)
New Revision: 60734

Modified:
   grass-addons/tools/module_svn_propset.sh
   grass-addons/tools/svn64merge
   grass-addons/tools/svn65merge
   grass-addons/tools/svn70merge
   grass-addons/tools/svn7merge
Log:
svn helper scripts: expand merge script msgs; simplify fortran propset management

Modified: grass-addons/tools/module_svn_propset.sh
===================================================================
--- grass-addons/tools/module_svn_propset.sh	2014-06-06 22:31:08 UTC (rev 60733)
+++ grass-addons/tools/module_svn_propset.sh	2014-06-07 22:15:23 UTC (rev 60734)
@@ -244,15 +244,9 @@
     cc | cpp)
 	apply_Cpp_code "$FILE"
 	;;
-    f)
+    f | for | f77 | f90)
 	apply_Fortran_code "$FILE"
 	;;
-    f77)
-	apply_Fortran_code "$FILE"
-	;;
-    f90)
-	apply_Fortran_code "$FILE"
-	;;
     py)
 	apply_python_script "$FILE"
 	;;

Modified: grass-addons/tools/svn64merge
===================================================================
--- grass-addons/tools/svn64merge	2014-06-06 22:31:08 UTC (rev 60733)
+++ grass-addons/tools/svn64merge	2014-06-07 22:15:23 UTC (rev 60734)
@@ -11,5 +11,6 @@
 if [ $# -eq 1 ] ; then
   svn merge -c $1 https://svn.osgeo.org/grass/grass/branches/releasebranch_6_4
 else
+  echo "Merge: pull from relbr64"
   echo "usage: cd grass65; svn64merge rev_number"
 fi

Modified: grass-addons/tools/svn65merge
===================================================================
--- grass-addons/tools/svn65merge	2014-06-06 22:31:08 UTC (rev 60733)
+++ grass-addons/tools/svn65merge	2014-06-07 22:15:23 UTC (rev 60734)
@@ -11,5 +11,6 @@
 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"
+  echo "Merge: pull from devbr6"
+  echo "usage: cd grass64; svn65merge rev_number"
 fi

Modified: grass-addons/tools/svn70merge
===================================================================
--- grass-addons/tools/svn70merge	2014-06-06 22:31:08 UTC (rev 60733)
+++ grass-addons/tools/svn70merge	2014-06-07 22:15:23 UTC (rev 60734)
@@ -1,5 +1,5 @@
 #!/bin/sh
-# script to make backporting easier: this one _pulls from_ trunk.
+# script to make backporting easier: this one _pulls from_ relbr70.
 #
 #  by Hamish Bowman, Feb 2011; released to the public domain
 #
@@ -11,5 +11,6 @@
 if [ $# -eq 1 ] ; then
   svn merge -c $1 https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0
 else
+  echo "Merge: pull from relbr70"
   echo "usage: cd grass65; svn70merge rev_number"
 fi

Modified: grass-addons/tools/svn7merge
===================================================================
--- grass-addons/tools/svn7merge	2014-06-06 22:31:08 UTC (rev 60733)
+++ grass-addons/tools/svn7merge	2014-06-07 22:15:23 UTC (rev 60734)
@@ -11,5 +11,6 @@
 if [ $# -eq 1 ] ; then
   svn merge -c $1 https://svn.osgeo.org/grass/grass/trunk
 else
-  echo "usage: cd grass65; svn7merge rev_number"
+  echo "Merge: pull from trunk"
+  echo "usage: cd grass70; svn7merge rev_number"
 fi