Show conflits on make update (bug #3191)
authorMark Spencer <markster@digium.com>
Wed, 29 Dec 2004 23:52:42 +0000 (23:52 +0000)
committerMark Spencer <markster@digium.com>
Wed, 29 Dec 2004 23:52:42 +0000 (23:52 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4599 65c4cc65-6c06-0410-ace0-fbb531ad65f3

Makefile

index c3eeac4..34b017b 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -382,8 +382,13 @@ datafiles: all
 update: 
        @if [ -d CVS ]; then \
                echo "Updating from CVS..." ; \
-               cvs -q -z3 update -Pd; \
+               cvs -q -z3 update -Pd | tee update.out; \
                rm -f .version; \
+               if [ `grep -c ^C update.out` -gt 0 ]; then \
+                       echo ; echo "The following files have conflicts:" ; \
+                       grep ^C update.out | cut -d' ' -f2- ; \
+               fi ; \
+               rm -f update.out; \
        else \
                echo "Not CVS";  \
        fi