diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-04-07 19:34:08 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-04-07 19:34:08 (GMT) |
| commit | e66fe3021503e214026cb70fae2decb6dd69234b (patch) | |
| tree | 3fd50a86531200e69665e5df5abb5c5bac76dd36 | |
| parent | 8c65d5458137af0c684162ea745d0cf42012b1bf (diff) | |
| download | cpython-e66fe3021503e214026cb70fae2decb6dd69234b.zip cpython-e66fe3021503e214026cb70fae2decb6dd69234b.tar.gz cpython-e66fe3021503e214026cb70fae2decb6dd69234b.tar.bz2 | |
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
........
| -rwxr-xr-x | Misc/build.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/build.sh b/Misc/build.sh index 0c058e3..bf3c883 100755 --- a/Misc/build.sh +++ b/Misc/build.sh @@ -259,6 +259,7 @@ start=`current_time` # which will definitely fail with a conflict. #CONFLICTED_FILE=commontex/boilerplate.tex #conflict_count=`grep -c "<<<" $CONFLICTED_FILE` +make clean conflict_count=0 if [ $conflict_count != 0 ]; then echo "Conflict detected in $CONFLICTED_FILE. Doc build skipped." > ../build/$F |