5 if [ ! -f .mergeinfo ] ; then
6 echo ".mergeinfo doesn't exist - exit"
12 if [ -f "$CONFLICTS" ] ; then
13 echo "$CONFLICTS exists - clean up first"
18 cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
20 echo -n "Tagging as ${CHILD}_BASE_$date ..."
21 $CVS tag -F ${CHILD}_BASE_$date $dir
23 echo -n "Tagging as ${CHILD}_BASE ..."
24 $CVS tag -F ${CHILD}_BASE $dir
26 echo "saving .mergeinfo as .mergeinfo-$date"
27 mv .mergeinfo .mergeinfo-$date