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