diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-04-07 19:27:36 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-04-07 19:27:36 +0000 |
| commit | 3aca4e5303d101bf1f5c295fa509c5a6043cb09f (patch) | |
| tree | cd271492916fd6913f37d3229ec6be9f742b8cfb | |
| parent | 38a16e145be1f9ee02718588e94c4c33828bc4ac (diff) | |
| download | cpython-git-3aca4e5303d101bf1f5c295fa509c5a6043cb09f.tar.gz | |
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 43b3ce4415..8c4df02f15 100755 --- a/Misc/build.sh +++ b/Misc/build.sh @@ -258,6 +258,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 |