traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 71335 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r71335 | benjamin.peterson | 2009-04-06 17:53:29 -0500 (Mon, 06 Apr 2009) | 1 line

  see if this helps the doc builds
........
This commit is contained in:
Benjamin Peterson 2009-04-07 19:34:08 +00:00
parent 8c65d54581
commit e66fe30215
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/build.sh
View File

@ -259,6 +259,7 @@ start=`current_time`
# which will definitely fail with a conflict. # which will definitely fail with a conflict.
#CONFLICTED_FILE=commontex/boilerplate.tex #CONFLICTED_FILE=commontex/boilerplate.tex
#conflict_count=`grep -c "<<<" $CONFLICTED_FILE` #conflict_count=`grep -c "<<<" $CONFLICTED_FILE`
make clean
conflict_count=0 conflict_count=0
if [ $conflict_count != 0 ]; then if [ $conflict_count != 0 ]; then
echo "Conflict detected in $CONFLICTED_FILE. Doc build skipped." > ../build/$F echo "Conflict detected in $CONFLICTED_FILE. Doc build skipped." > ../build/$F