Author: jleroux
Date: Mon Feb 24 10:03:24 2014
New Revision: 1571209
URL:
http://svn.apache.org/r1571209Log:
"Applied fix from trunk for revision: 1571207 "
------------------------------------------------------------------------
r1571207 | jleroux | 2014-02-24 11:02:07 +0100 (lun. 24 févr. 2014) | 1 ligne
Small fix due to Windows 7 behaviour change
------------------------------------------------------------------------
Modified:
ofbiz/branches/release13.07/ (props changed)
ofbiz/branches/release13.07/tools/mergefromtrunk.bat
Propchange: ofbiz/branches/release13.07/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1571207
Modified: ofbiz/branches/release13.07/tools/mergefromtrunk.bat
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/tools/mergefromtrunk.bat?rev=1571209&r1=1571208&r2=1571209&view=diff==============================================================================
--- ofbiz/branches/release13.07/tools/mergefromtrunk.bat (original)
+++ ofbiz/branches/release13.07/tools/mergefromtrunk.bat Mon Feb 24 10:03:24 2014
@@ -21,6 +21,7 @@ rem interactive DOS version of mergefrom
rem to use : launch and pass the trunk version number to merge in release
rem since we have now svn:mergeinfo changing root ("."), we need to update before merging
+cd ..
svn up
rem version to merge