kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 14:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show conflits on make update (bug #3191)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4599 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-12-29 23:52:42 +00:00
parent ccead56701
commit cc01517489
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -382,8 +382,13 @@ datafiles: all
update: update:
@if [ -d CVS ]; then \ @if [ -d CVS ]; then \
echo "Updating from CVS..." ; \ echo "Updating from CVS..." ; \
cvs -q -z3 update -Pd; \ cvs -q -z3 update -Pd | tee update.out; \
rm -f .version; \ 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 \ else \
echo "Not CVS"; \ echo "Not CVS"; \
fi fi