Author: jleroux
Date: Sun Aug 19 10:26:09 2007
New Revision: 567434
URL:
http://svn.apache.org/viewvc?view=rev&rev=567434Log:
Update : interactive DOS version of mergefromtrunk.sh.
Modified:
ofbiz/branches/release4.0/mergefromtrunk.bat
Modified: ofbiz/branches/release4.0/mergefromtrunk.bat
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release4.0/mergefromtrunk.bat?view=diff&rev=567434&r1=567433&r2=567434==============================================================================
--- ofbiz/branches/release4.0/mergefromtrunk.bat (original)
+++ ofbiz/branches/release4.0/mergefromtrunk.bat Sun Aug 19 10:26:09 2007
@@ -1,8 +1,10 @@
+rem interactive DOS version of mergefromtrunk.sh.
+rem to use : launch and pass the trunk version number to merge in release
+
echo off
-rem DOS version of mergefromtrunk.sh. A bit clumsy but it works. If someone is able to do better I am taker JLR 2007/05/27
-rem to use : mergefromtrunk trunk_rev_number_to_merge_in _release
-set /a prevRev=%1% - 1
-rem DOS eats char below %1%. It eats exactly "https:" don't know why, I tried to add them : it works (DOS ways are impenetrable)
+set /p version=version to merge :
+set /a prevRev=%version% - 1
echo on
-svn merge -r %prevRev%:%1% https:
https://svn.apache.org/repos/asf/ofbiz/trunk-svn commit -m "Applied fix from trunk for revision: %1%"
+svn merge -r %prevRev%:%version%
https://svn.apache.org/repos/asf/ofbiz/trunk+svn commit -m "Applied fix from trunk for revision: %version%"
+pause