3 if [ ! -f .mergeinfo ] ; then
4 echo ".mergeinfo doesn't exist - exit"
10 if [ "$OPERATION" != "Merge" ] ; then
11 echo "OPERATION must be Merge - is $OPERATION"
12 echo "You should probably be running ${OPERATION}2.sh"
16 if [ -f $CONFLICTS ] ; then
17 echo "$CONFLICTS exists - clean up first"
22 cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
24 echo -n "Tagging ${PARENT}_${CHILD}_UPDATE_PARENT_$date as ${CHILD}_BASE_$date ..."
25 cvs rtag -r ${PARENT}_${CHILD}_UPDATE_PARENT_$date ${CHILD}_BASE_$date $module
27 echo -n "Tagging ${CHILD}_BASE as ${CHILD}_BASE_PREV ...."
28 cvs rtag -F -r ${CHILD}_BASE ${CHILD}_BASE_PREV $module
30 echo "${CHILD}_BASE_$date as ${CHILD}_BASE ..."
31 cvs rtag -F -r ${CHILD}_BASE_$date ${CHILD}_BASE $module
33 echo "saving .mergeinfo as .mergeinfo-$date"
34 mv .mergeinfo .mergeinfo-$date