Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Need to include mount_utils.h in the _SOURCES for the tools that use it.
[fs/lustre-release.git]
/
build
/
replace2.sh
diff --git
a/build/replace2.sh
b/build/replace2.sh
index
71a03fd
..
e0f7b2b
100755
(executable)
--- a/
build/replace2.sh
+++ b/
build/replace2.sh
@@
-1,4
+1,4
@@
-#!/bin/sh -e
+#!/bin/
ba
sh -e
CVS=cvs
CVS=cvs
@@
-9,7
+9,7
@@
fi
. .mergeinfo
. .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
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 ..."
# 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 ..."
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
echo "saving .mergeinfo as .mergeinfo-$date"
mv .mergeinfo .mergeinfo-$date