Author: doogie
Date: Sat Jul 31 18:40:20 2010
New Revision: 981078
URL: http://svn.apache.org/viewvc?rev=981078&view=rev
Log:
Few last changes, svn up pulled from the .bat version of this, and improve the
log message.
Modified:
ofbiz/branches/release10.04/mergefromtrunk.sh
Modified: ofbiz/branches/release10.04/mergefromtrunk.sh
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/mergefromtrunk.sh?rev=981078&r1=981077&r2=981078&view=diff
==============================================================================
--- ofbiz/branches/release10.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release10.04/mergefromtrunk.sh Sat Jul 31 18:40:20 2010
@@ -84,10 +84,11 @@ case "$cmd" in
# do not run any of the following commands in a complex
# chained pipe; if one of the commands in the pipe fails,
# it isn't possible to detect the failure.
- printf "Applied fix from trunk for revision: %s \n" "$rev" >
runtime/merge-state/log-message
+ printf "Applied fix from trunk for revision: %s \n===\n\n"
"$rev" > runtime/merge-state/log-message
svn log --xml https://svn.apache.org/repos/asf/ofbiz/trunk -r
"$rev" > runtime/merge-state/log.xml
sed -ne '/^<msg>/s,<msg>\(.*\)</msg>$,\1,p' <
runtime/merge-state/log.xml >> runtime/merge-state/log-message
prevRev=$(($rev - 1))
+ svn up
svn merge -r "$prevRev:$rev"
https://svn.apache.org/repos/asf/ofbiz/trunk
;;
(test)
@@ -96,7 +97,7 @@ case "$cmd" in
ant run-tests
;;
(commit)
- svn commit
+ svn commit -F runtime/merge-state/log-message
rm -rf runtime/merge-state
;;
(abort)
