-#!/bin/sh -e
+#!/bin/bash -e
CONFLICTS=cvs-merge-conflicts
CVS="cvs -z3"
fi
if [ $# -lt 2 -o $# -gt 3 ]; then
- echo "This is phase 1 of merging branches. Usage: $0 parent child [dir]"
+ echo "This is phase 1 of merging branches. Usage: $0 parent child dir"
exit
fi
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 merge lustre or portals, not the whole tree."
echo >&2 "${progname}: Try using ${0} $parent $child lustre"
exit 1
fi
fi
TEST_FILE=${TEST_FILE:-ChangeLog} # does this need to be smarter?
+[ $dir = "build" ] && TEST_FILE=lbuild
check_tag() {
[ -z "$1" ] && echo "check_tag() missing arg" && exit3
[ "$1" = "HEAD" ] && return