svn commit: r770755 - /ofbiz/branches/release09.04/mergefromtrunk.sh

Author: jleroux
Date: Fri May  1 17:03:53 2009
New Revision: 770755

URL: http://svn.apache.org/viewvc?rev=770755&view=rev
Log:
A 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=770755&r1=770754&r2=770755&view=diff
==============================================================================
--- ofbiz/branches/release09.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release09.04/mergefromtrunk.sh Fri May  1 17:03:53 2009
@@ -2,5 +2,11 @@
 
 prevRev=`expr $1 - 1`
 svn merge -r $prevRev:$1 https://svn.apache.org/repos/asf/ofbiz/trunk 
-svn commit -m "Applied fix from trunk for revision: $1"
+trunkLog=runtime/trunkLog.xml
+touch ${trunkLog}
+svn log --xml -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}
+svn commit -m "`echo ${releaseBranchMessage} ${trunkMessage}`"