. .mergeinfo
-if [ "$OPERATION" -ne "Replace" ] ; then
+if [ "$OPERATION" != "Replace" ] ; then
echo "OPERATION must be Replace - is $OPERATION"
echo "You should probably be running ${OPERATION}2.sh"
exit
# Tag parent
echo -n "Tagging as ${CHILD}_REPLACED_${PARENT}_$date ..."
-$CVS tag -F ${CHILD}_REPLACED_${PARENT}_$date $dir
+$CVS rtag -r $parent ${CHILD}_REPLACED_${PARENT}_$date $module
echo "done"
# In case someone tries to re-land later
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