5 if [ ! -f .mergeinfo ] ; then
6 echo ".mergeinfo doesn't exist - exit"
12 if [ "$OPERATION" != "Land" ] ; then
13 echo "OPERATION must be Land - is $OPERATION"
14 echo "You should probably be running ${OPERATION}2.sh"
18 if [ -f "$CONFLICTS" ] ; then
19 echo "$CONFLICTS exists - clean up first"
24 cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
26 echo -n "Tagging as ${CHILD}_BASE_$date ..."
27 $CVS rtag -r $parent ${CHILD}_BASE_$date $module
29 echo -n "Tagging as ${CHILD}_BASE ..."
30 $CVS rtag -F -r $parent ${CHILD}_BASE $module
32 echo "saving .mergeinfo as .mergeinfo-$date"
33 mv .mergeinfo .mergeinfo-$date