[Asterisk-cvs] asterisk Makefile,1.126,1.127

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv22331

Modified Files:
	Makefile 
Log Message:
Show conflits on make update (bug #3191)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- Makefile	19 Dec 2004 17:33:19 -0000	1.126
+++ Makefile	29 Dec 2004 23:52:42 -0000	1.127
@@ -382,8 +382,13 @@
 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