svn commit: r983944 - /ofbiz/branches/release09.04/mergefromtrunk.bat

[jl...@apache.org]

Author: jleroux
Date: Tue Aug 10 11:52:44 2010
New Revision: 983944

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

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

Modified: ofbiz/branches/release09.04/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/mergefromtrunk.bat?rev=983944&r1=983943&r2=983944&view=diff
==============================================================================
--- ofbiz/branches/release09.04/mergefromtrunk.bat (original)
+++ ofbiz/branches/release09.04/mergefromtrunk.bat Tue Aug 10 11:52:44 2010
@@ -37,21 +37,25 @@ rem keep the comment.tmp file svn ignore
 rem commit the backport to release with comment fom file
 echo on
 svn merge -r %prevRev%:%version% https://svn.apache.org/repos/asf/ofbiz/trunk
-svn commit -F comment.tmp
 
 
 :menu
 echo y) tests
 echo n) exit
-choice /c:yn Do you want to run tests ?
-if errorlevel = 2 goto exit
+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
 
+:commit
+svn commit -F comment.tmp
+goto exit
+
 :tests
 ant clean-all
 ant run-install
 ant run-tests
 
+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
-echo you can now do the commit by hand
 pause
\ No newline at end of file