You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2017/02/23 21:55:59 UTC
svn commit: r1784207 - in /ofbiz/branches:
release14.12/tools/mergefromtrunk.bat release15.12/tools/mergefromtrunk.bat
Author: jleroux
Date: Thu Feb 23 21:55:59 2017
New Revision: 1784207
URL: http://svn.apache.org/viewvc?rev=1784207&view=rev
Log:
No functional change, adds more information in echo
Modified:
ofbiz/branches/release14.12/tools/mergefromtrunk.bat
ofbiz/branches/release15.12/tools/mergefromtrunk.bat
Modified: ofbiz/branches/release14.12/tools/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/tools/mergefromtrunk.bat?rev=1784207&r1=1784206&r2=1784207&view=diff
==============================================================================
--- ofbiz/branches/release14.12/tools/mergefromtrunk.bat (original)
+++ ofbiz/branches/release14.12/tools/mergefromtrunk.bat Thu Feb 23 21:55:59 2017
@@ -29,7 +29,7 @@ set /p version=version to merge :
set /a prevRev=%version% - 1
rem build the comment
-echo "Applied fix from trunk for revision: %version%" > comment.tmp
+echo "Applied fix from trunk framework 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
del log.tmp
@@ -56,9 +56,7 @@ goto exit
:tests
echo on
-ant clean-all
-ant load-demo
-ant run-tests
+ant clean-all load-demo run-tests
echo off
echo You can now do the commit by hand if all is OK. The comment grabbed from trunk by the merge is in the file comment.tmp at root
Modified: ofbiz/branches/release15.12/tools/mergefromtrunk.bat
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/tools/mergefromtrunk.bat?rev=1784207&r1=1784206&r2=1784207&view=diff
==============================================================================
--- ofbiz/branches/release15.12/tools/mergefromtrunk.bat (original)
+++ ofbiz/branches/release15.12/tools/mergefromtrunk.bat Thu Feb 23 21:55:59 2017
@@ -29,7 +29,7 @@ set /p version=version to merge :
set /a prevRev=%version% - 1
rem build the comment
-echo "Applied fix from trunk for revision: %version%" > comment.tmp
+echo "Applied fix from trunk framework 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
del log.tmp
@@ -56,9 +56,7 @@ goto exit
:tests
echo on
-ant clean-all
-ant load-demo
-ant run-tests
+ant clean-all load-demo run-tests
echo off
echo You can now do the commit by hand if all is OK. The comment grabbed from trunk by the merge is in the file comment.tmp at root