smash the HEAD with the contents of b_cmd. HEAD_PRE_CMD_SMASH and

[fs/lustre-release.git] / lustre / scripts / land2.sh

diff --git a/lustre/scripts/land2.sh b/lustre/scripts/land2.sh
index 6690e7d..2bb9fad 100755 (executable)
--- a/lustre/scripts/land2.sh
+++ b/lustre/scripts/land2.sh
@@ -9,13 +9,13 @@ fi
 
 . .mergeinfo
 
-if [ -f $CONFLICTS ] ; then
+if [ -f "$CONFLICTS" ] ; then
     echo "$CONFLICTS exists - clean up first"
     cat $CONFLICTS
     exit 
 fi
 
-cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
+#cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
 
 echo -n "Tagging as ${CHILD}_BASE_$date ..."
 $CVS tag -F ${CHILD}_BASE_$date $dir