Add configure option to allow repackaging of e2fsprogs as ldiskfsprogs. (by Jim Garlick)

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

diff --git a/build/land2.sh b/build/land2.sh
index 2bb9fad..ea616a9 100755 (executable)
--- 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