Author: pranayp
Date: Sat May 21 06:23:48 2016
New Revision: 1744846
URL: http://svn.apache.org/viewvc?rev=1744846&view=rev
Log:
Ooops, reverting un-intentional changes from my last commit revision 1744838.
Modified:
ofbiz/branches/release13.07/tools/mergefromtrunk.sh
Modified: ofbiz/branches/release13.07/tools/mergefromtrunk.sh
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release13.07/tools/mergefromtrunk.sh?rev=1744846&r1=1744845&r2=1744846&view=diff
==============================================================================
--- ofbiz/branches/release13.07/tools/mergefromtrunk.sh (original)
+++ ofbiz/branches/release13.07/tools/mergefromtrunk.sh Sat May 21 06:23:48 2016
@@ -83,7 +83,7 @@ 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------------------------------------------------------------------------\n\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 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 - 1)) < runtime/merge-state/log.txt >
runtime/merge-state/log.txt.head
