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
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."