summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rwxr-xr-xutils/cvsupdate7
1 files changed, 6 insertions, 1 deletions
diff --git a/utils/cvsupdate b/utils/cvsupdate
index fca274c810..2d21d21eda 100755
--- a/utils/cvsupdate
+++ b/utils/cvsupdate
@@ -1,4 +1,4 @@
-#!/bin/csh -f -c
+#!/bin/csh -f
#
# This script updates the entire tree, saves the output in cvs.out,
# and then separately prints out the files that had merge conflicts,
@@ -31,6 +31,11 @@ end
if ($doit == 1) then
/bin/mv -f cvs.out cvs.out.bak
cvs update -P -d >& cvs.out
+ if ($status != 0) then
+ echo "ERROR: CVS update failed: "
+ cat cvs.out
+ exit 1
+ endif
else
echo ""; echo "Not updating files."; echo ""
endif