Author: dkulp Date: Mon Jul 8 19:16:48 2013 New Revision: 1500891 URL: http://svn.apache.org/r1500891 Log: Force some updates/reverts in the output area so resolve a conflict
Modified: camel/website/build_cms.sh Modified: camel/website/build_cms.sh URL: http://svn.apache.org/viewvc/camel/website/build_cms.sh?rev=1500891&r1=1500890&r2=1500891&view=diff ============================================================================== --- camel/website/build_cms.sh (original) +++ camel/website/build_cms.sh Mon Jul 8 19:16:48 2013 @@ -1,3 +1,5 @@ #!/bin/sh +svn up $2 +svn revert -R $2 bin/update-site -Dsite.output=$2