end
if ($doit == 1) then
- /bin/mv -f cvs.out cvs.out.bak
+ /bin/mv -f cvs.out cvs.out.bak >&/dev/null
cvs update -P -d >& cvs.out
## if ($status != 0) then
## echo "ERROR: CVS update failed: "
endif
echo ""; echo " FILES UPDATED:"
-grep '^U' cvs.out
+grep '^[UP] ' cvs.out
echo ""; echo " UPDATE CONFLICTS OCCURRED FOR THE FOLLOWING FILES:"
-grep '^C' cvs.out
+grep '^C ' cvs.out
-echo ""; echo " FILES REMOVED FROM YOUR DIRECTORY:"
+echo ""; echo " NEW FILES THAT NEED TO BE COMMITTED:"
+grep '^[AR] ' cvs.out
+
+echo ""; echo " FILES REMOVED FROM YOUR DIRECTORY:"
grep 'no longer in the repository' cvs.out
echo ""; echo " FILES SUCCESSFULLY MERGED (or locally modified):"
-grep '^M' cvs.out | grep -v Merging
+grep '^M ' cvs.out
echo ""; echo " NEW FILES AND DIRECTORIES:"
if ($printnew != 0) then