Reverted accidental commit

svn changeset:23229/svn branch:6.8

diff --git a/build/build.xml b/build/build.xml
index aee3dc7bed70d3b4bf2344d4cc73c1d01cc4dc46..1fdcc0ee25f932281b4e50c163e2fead0e27502f 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -542,7 +542,7 @@
     <target name="compile-widgetset" description="Compiles the widgetset given as the first parameter">
         <fail unless="widgetset" message="No widgetset parameter set"/>
         <property name="widgetset-style" value="OBF" />
-       <property name="widgetset-localWorkers" value="1" />
+       <property name="widgetset-localWorkers" value="4" />
        <property name="widgetset-extraParams" value="" />
         <echo>Compiling widgetset ${widgetset}. Output directory: ${widgetsets-output-dir}</echo>
         <java classname="com.google.gwt.dev.Compiler" failonerror="yes" fork="yes" maxmemory="512m">

diff --git a/scripts/merge.sh b/scripts/merge.sh
index 9125a505b7cb545356d572f826b16cb2e6327551..a8c356ad30bb21f9dc3e2ae981a17583e7e9d826 100755 (executable)
--- a/scripts/merge.sh
+++ b/scripts/merge.sh
@@ -13,14 +13,14 @@ localchanges=`svn stat|wc -l`
 if [ "$localchanges" != "0" ]
 then
        echo "You must have a clean working space copy"
-       #exit 2
+       exit 2
 fi
 
 if [ "$SVN_PASS_FILE" != "" ]
 then
        SVN_PASS=`cat "$SVN_PASS_FILE"`
 fi
-
+       
 svn up
 
 currentrepowithoutversion=`svn info|grep URL|sed "s/URL: //"|sed "s/\/[^\/]*$//"`