diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-29 23:52:42 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-12-29 23:52:42 +0000 |
commit | 33b0c75e5af0b29db831d8201aada7cfa0c34955 (patch) | |
tree | 0fd84a5f9d7dc57deffc5e6d1d0d7fa5475daddd /Makefile | |
parent | 15c76b6dac28f9deec50f346802ebcfe792d047c (diff) |
Show conflits on make update (bug #3191)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4599 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rwxr-xr-x | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -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 |