Commits

Benjamin Peterson  committed d16cada

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
........

  • Participants
  • Parent commits 5a49462
  • Branches 2.6

Comments (0)

Files changed (1)

File Misc/build.sh

 # 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