Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Summarize checkout conflicts before dying.

Browse Source
This commit is contained in:
slamm%netscape.com 1999-03-11 01:21:25 +00:00
parent 53338e8a97
commit e62f66bac3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client.mk
View File

@ -214,9 +214,11 @@ checkout:
@date > $(CVSCO_LOGFILE)
cd $(ROOTDIR) && \
$(CVSCO) $(MOZ_CO_MODULE) 2>&1 | tee -a $(CVSCO_LOGFILE)
@if egrep "^C " $(CVSCO_LOGFILE) > /dev/null 2>&1 ; then \
echo "$(MAKE): *** Conflicts during checkout. \
Refer to $(CVSCO_LOGFILE)."; \
@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
if test "$$conflicts" ; then \
echo "$(MAKE): *** Conflicts during checkout." ;\
echo "$$conflicts" ;\
echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\
exit 1; \
fi