Author: jleroux
Date: Tue Jun 5 04:29:26 2007
New Revision: 544448
URL:
http://svn.apache.org/viewvc?view=rev&rev=544448Log:
Applied fix from trunk for revision: 543408
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=544448&r1=544447&r2=544448==============================================================================
--- ofbiz/branches/release4.0/mergefromtrunk.bat (original)
+++ ofbiz/branches/release4.0/mergefromtrunk.bat Tue Jun 5 04:29:26 2007
@@ -1,5 +1,8 @@
+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)
+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%"