You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2010/12/09 22:11:12 UTC
svn commit: r1044131 - /ofbiz/branches/release09.04/mergefromtrunk.sh
Author: doogie
Date: Thu Dec 9 21:11:12 2010
New Revision: 1044131
URL: http://svn.apache.org/viewvc?rev=1044131&view=rev
Log:
Fix for truncation of final line of original message in commit.
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=1044131&r1=1044130&r2=1044131&view=diff
==============================================================================
--- ofbiz/branches/release09.04/mergefromtrunk.sh (original)
+++ ofbiz/branches/release09.04/mergefromtrunk.sh Thu Dec 9 21:11:12 2010
@@ -86,8 +86,8 @@ case "$cmd" in
printf "Applied fix from trunk for revision: %s \n===\n\n" "$rev" > runtime/merge-state/log-message
svn log https://svn.apache.org/repos/asf/ofbiz/trunk -r "$rev" > runtime/merge-state/log.txt
set -- $(wc -l runtime/merge-state/log.txt)
- head -n $(($1 - 2)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
- tail -n $(($1 - 5)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
+ head -n $(($1 - 1)) < runtime/merge-state/log.txt > runtime/merge-state/log.txt.head
+ tail -n $(($1 - 4)) < runtime/merge-state/log.txt.head >> runtime/merge-state/log-message
prevRev=$(($rev - 1))
svn up
svn merge -r "$prevRev:$rev" https://svn.apache.org/repos/asf/ofbiz/trunk