Author: nickboldt Date: 2010-06-11 00:21:45 -0400 (Fri, 11 Jun 2010) New Revision: 22751 Modified: trunk/build/build.xml Log: merge from branch: do not revert before update Modified: trunk/build/build.xml =================================================================== --- trunk/build/build.xml 2010-06-11 04:20:32 UTC (rev 22750) +++ trunk/build/build.xml 2010-06-11 04:21:45 UTC (rev 22751) @@ -324,10 +324,12 @@ quiet="true" /> </then> - </if> --> + --> + <!-- <svn javahl="false" svnkit="true" failonerror="false"> <revert recurse="${svn.recurse}" dir="@{component}" /> </svn> + --> <svn javahl="false" svnkit="true" failonerror="false"> <update recurse="${svn.recurse}" dir="@{component}" /> </svn>