From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 7 Apr 2009 19:42:10 +0000 (+0000)
Subject: Merged revisions 71374 via svnmerge from
X-Git-Tag: 3.0~250
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b39ba5267e90cb6191af8f3d07b834ce31e0a4cc;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 71374 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r71374 | benjamin.peterson | 2009-04-07 14:34:08 -0500 (Tue, 07 Apr 2009) | 9 lines

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

diff --git a/Misc/build.sh b/Misc/build.sh
index 9062e3d0250c..c9d62fcba2bb 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