X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fbranch.sh;h=0b9b1cd2cc1d12dda74a36b33b2fef4db6eddf1a;hp=aa6ecce690e1a6d8afe8ecf3f05459aa03992df3;hb=bc5ee103b432d1d390e3b84ac7804e1f513ad6e4;hpb=ab1b85a9d1ecd13b59ce3a5e363a69aa52a07f7c

diff --git a/build/branch.sh b/build/branch.sh
index aa6ecce..0b9b1cd 100755
--- 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