Branch b1_4

Shouldn't be able to run land2.sh with uncommitted changes.

diff --git a/build/land2.sh b/build/land2.sh
index 2bb9fad..26dce76 100755 (executable)
--- a/build/land2.sh
+++ b/build/land2.sh
@@ -15,7 +15,7 @@ if [ -f "$CONFLICTS" ] ; then
     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