b=22281 refactor packaging and versioning

[fs/lustre-release.git] / build / branch.sh

diff --git a/build/branch.sh b/build/branch.sh
index aa6ecce..0b9b1cd 100755 (executable)
--- a/build/branch.sh
+++ b/build/branch.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e 
+#!/bin/bash -e 
 CVS=${CVS:-cvs}
 
 progname=${0##*/}
@@ -19,7 +19,7 @@ fi
 module=$(basename $(<$dir/CVS/Repository))
 
 if [ "$module" = "lustre" ]; then
-    echo >&2 "${progname}: You probably want to branch lustre or portals."
+    echo >&2 "${progname}: You probably want to branch lustre or lnet."
     echo >&2 "${progname}: Try using ${0} $parent $child lustre"
     exit 1
 fi
@@ -35,13 +35,13 @@ case $child in
   *) child="b_$child"
 esac
 
-if [ "$parent" != "HEAD" -a -f $dir/CVS/Tag ]; then
+#if [ "$parent" != "HEAD" -a -f $dir/CVS/Tag ]; then
        # put in separate condition as bash evaluates all conditions unlike C
-       if [ "`cat $dir/CVS/Tag`" != "T$parent" ]; then
-               echo "This script must be run within the $parent branch"
-               exit 1
-       fi
-fi
+#      if [ "`cat $dir/CVS/Tag`" != "T$parent" ]; then
+#              echo "This script must be run within the $parent branch"
+#              exit 1
+#      fi
+#fi
 
 echo parent: $parent CHILD: $CHILD child: $child date: $date