X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Fland2.sh;h=ea616a91cde2030194ae42f829430e91ed2abe93;hb=0201023b739be4b8c15e48c34e77c0e14ca68c1a;hp=2bb9fade4c6250e73dffce5e4c2b9a30c00b67c5;hpb=c9bd81d352c0e43db47d4846b97ee1ddd9565839;p=fs%2Flustre-release.git

diff --git a/build/land2.sh b/build/land2.sh
index 2bb9fad..ea616a9 100755
--- a/build/land2.sh
+++ b/build/land2.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e 
+#!/bin/bash -e 
 
 CVS=cvs
 
@@ -9,19 +9,25 @@ fi
 
 . .mergeinfo
 
+if [ "$OPERATION" != "Land" ] ; then
+    echo "OPERATION must be Land - is $OPERATION"
+    echo "You should probably be running ${OPERATION}2.sh"
+    exit
+fi
+
 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
+$CVS rtag -r $parent ${CHILD}_BASE_$date $module
 echo "done"
 echo -n "Tagging as ${CHILD}_BASE ..."
-$CVS tag -F ${CHILD}_BASE $dir
+$CVS rtag -F -r $parent ${CHILD}_BASE $module
 
 echo "saving .mergeinfo as .mergeinfo-$date"
 mv .mergeinfo .mergeinfo-$date