From: Mark Spencer <markster@digium.com>
Date: Wed, 29 Dec 2004 23:52:42 +0000 (+0000)
Subject: Show conflits on make update (bug #3191)
X-Git-Tag: 1.2.0-beta1~1538
X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=commitdiff_plain;h=cc015174898b9ebed02694588d1497e6f18ad5df;hp=ccead56701655050a18b883e024ae7a74325373e

Show conflits on make update (bug #3191)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/Makefile b/Makefile
index c3eeac4..34b017b 100755
--- 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