Author: jleroux
Date: Fri Jan 26 15:19:26 2018
New Revision: 1822313
URL: http://svn.apache.org/viewvc?rev=1822313&view=rev
Log:
This is a long awaited fix which removes the "SUB" character from comments
when merging in Windows. Using /b for binary when copying works.
Modified:
ofbiz/tools/mergefromplugins.bat
ofbiz/tools/mergefromtrunk.bat
Modified: ofbiz/tools/mergefromplugins.bat
URL:
http://svn.apache.org/viewvc/ofbiz/tools/mergefromplugins.bat?rev=1822313&r1=1822312&r2=1822313&view=diff
==============================================================================
--- ofbiz/tools/mergefromplugins.bat (original)
+++ ofbiz/tools/mergefromplugins.bat Fri Jan 26 15:19:26 2018
@@ -30,7 +30,7 @@ set /a prevRev=%version% - 1
rem build the comment
echo "Applied fix from plugins for revision: %version%" > comment.tmp
svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-plugins/trunk -r
%version% > log.tmp
-copy comment.tmp + log.tmp = comment.tmp
+copy /b comment.tmp + log.tmp = comment.tmp
del log.tmp
rem keep the comment.tmp file svn ignored. In case of trouble always happier
to keep trace. It will be overidden in next backport.
Modified: ofbiz/tools/mergefromtrunk.bat
URL:
http://svn.apache.org/viewvc/ofbiz/tools/mergefromtrunk.bat?rev=1822313&r1=1822312&r2=1822313&view=diff
==============================================================================
--- ofbiz/tools/mergefromtrunk.bat (original)
+++ ofbiz/tools/mergefromtrunk.bat Fri Jan 26 15:19:26 2018
@@ -30,7 +30,7 @@ set /a prevRev=%version% - 1
rem build the comment
echo "Applied fix from trunk for revision: %version%" > comment.tmp
svn log https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk -r
%version% > log.tmp
-copy comment.tmp + log.tmp = comment.tmp
+copy /b comment.tmp + log.tmp = comment.tmp
del log.tmp
rem keep the comment.tmp file svn ignored. In case of trouble always happier
to keep trace. It will be overidden in next backport.
