X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2Freplace2.sh;h=e0f7b2b05dd55f7d01283e812d264224e5ec4a5a;hb=a56b6687b68421b032b333c1e95a45950f7b625c;hp=71a03fda14e66b395541780c1f3225875b97e845;hpb=67c0d9576131651bb696c1917ed37508c7d22d31;p=fs%2Flustre-release.git

diff --git a/build/replace2.sh b/build/replace2.sh
index 71a03fd..e0f7b2b 100755
--- a/build/replace2.sh
+++ b/build/replace2.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e 
+#!/bin/bash -e 
 
 CVS=cvs
 
@@ -9,7 +9,7 @@ fi
 
 . .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
@@ -25,11 +25,11 @@ cvs update $dir 2>&1 | grep "^M" && echo "uncommitted changes" && exit 1
 
 # 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