Author: jleroux
Date: Sat May 2 12:16:51 2009
New Revision: 770943
URL:
http://svn.apache.org/viewvc?rev=770943&view=revLog:
A 2d fixing patch from Ashish Vijaywargiya "Improved functionality of mergefromtrunk.sh" (
https://issues.apache.org/jira/browse/OFBIZ-2404) - OFBIZ-2404
Modified:
ofbiz/branches/release09.04/mergefromtrunk.sh
Modified: ofbiz/branches/release09.04/mergefromtrunk.sh
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/mergefromtrunk.sh?rev=770943&r1=770942&r2=770943&view=diff==============================================================================
--- ofbiz/branches/release09.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release09.04/mergefromtrunk.sh Sat May 2 12:16:51 2009
@@ -4,7 +4,7 @@
svn merge -r $prevRev:$1
https://svn.apache.org/repos/asf/ofbiz/trunk
trunkLog=runtime/trunkLog.xml
touch ${trunkLog}
-svn log --xml -r $1> ${trunkLog}
+svn log --xml
https://svn.apache.org/repos/asf/ofbiz/trunk -r $1> ${trunkLog}
releaseBranchMessage="Applied fix from trunk for revision: $1 \n"
trunkMessage=`grep -e '<msg>' ${trunkLog} | sed 's/<msg>//' | sed 's/<\/msg>//'`
rm -rf ${trunkLog}