date=`date +%Y%m%d_%H%M`
dir=${3:-.}
-module=$(<$dir/CVS/Repository)
+module=$(basename $(<$dir/CVS/Repository))
if [ "$module" = "lustre" ] ; then
- echo >&2 "${progname}: You probably want to branch lustre or portals, not the whole tree."
+ echo >&2 "${progname}: You probably want to land lustre or portals, not the whole tree."
echo >&2 "${progname}: Try using ${0} $parent $child lustre"
exit 1
fi
check_tag() {
[ -z "$1" ] && echo "check_tag() missing arg" && exit3
[ "$1" = "HEAD" ] && return
- $CVS log $dir/$TEST_FILE 2> /dev/null | grep -q " $1: " && return
+ $CVS log ${dir%%/*}/$TEST_FILE 2> /dev/null | grep -q " $1: " && return
echo "${progname}: tag $1 not found in $dir/$TEST_FILE"
exit 2
}
echo "done"
echo -n "Recording conflicts in $CONFLICTS ..."
-if $CVS update | grep '^C' > $CONFLICTS; then
+$CVS update | awk '/^C/ { print $2 }' > $CONFLICTS
+if [ -s $CONFLICTS ] ; then
echo "Conflicts found, fix before committing."
cat $CONFLICTS
else