svn commit: r983984 - /ofbiz/branches/release10.04/mergefromtrunk.bat

Author: jleroux
Date: Tue Aug 10 13:14:05 2010
New Revision: 983984

URL: http://svn.apache.org/viewvc?rev=983984&view=rev
Log:
Better process: separate clearly automatic commit from tests

Modified:
    ofbiz/branches/release10.04/mergefromtrunk.bat

Modified: ofbiz/branches/release10.04/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.bat?rev=983984&r1=983983&r2=983984&view=diff
==============================================================================
--- ofbiz/branches/release10.04/mergefromtrunk.bat (original)
+++ ofbiz/branches/release10.04/mergefromtrunk.bat Tue Aug 10 13:14:05 2010
@@ -42,11 +42,11 @@ svn merge -r %prevRev%:%version% https:/
 :menu
 echo y) tests
 echo n) exit
-choice /c:yn Do you want to run tests ?
-if errorlevel = 2 goto noTests
+choice /c:yn Do you want to run tests (else the commit will be done automatically using the comment grabed from trunk by the merge)?
+if errorlevel = 2 goto commit
 if errorlevel = 1 goto tests
 
-:noTests
+:commit
 svn commit -F comment.tmp
 goto exit
 
@@ -55,7 +55,7 @@ ant clean-all
 ant run-install
 ant run-tests
 
-echo you can now do the commit by hand if all is OK
+echo You can now do the commit by hand if all is OK. The comment grabed from trunk by the merge is in the file comment.tmp at root
 
 :exit
 pause