Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug 43494 - client.mk should stop if you had checkout

Browse Source 
conflicts.  r=alecf.


git-svn-id: svn://10.0.0.236/trunk@72949 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bryner%uiuc.edu 2000-06-22 21:56:41 +00:00
parent dc8257a1fa
commit a660cd8052
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/client.mk
View File

@ -288,8 +288,8 @@ real_checkout:
cvs_co $(CVSCO_LDAPCSDK) && \
cvs_co $(CVSCO_SEAMONKEY)
@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
# @: Check the log for conflicts. ;\
conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
# @: Check the log for conflicts. ;
@conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\
if test "$$conflicts" ; then \
echo "$(MAKE): *** Conflicts during checkout." ;\
echo "$$conflicts" ;\