Hello Adam, Thanks for your comment. Please see my comments inline:
-- Ashish On Fri, Oct 23, 2009 at 2:39 AM, Adam Heath <[email protected]> wrote: > Ashish Vijaywargiya wrote: > > Is this log message verbose for the person reading the history of commit > > logs? > > Please try to use mergefromtrunk.sh file that will do everything for you > > automatically or do copy paste of log message from trunk here for easy > > reference for the person reading log. > > > > Here is the command that can be used on terminal window. > > ./mergefromtrunk.sh 827730 > > I did 2 backports. release4.0 had a conflict, and I had to do it by > hand. I looked at what the script did, and did it all manually. > > However, for release09.04, which you are commenting on, I used the > script completely, so I don't know what you are complaining about. > If you might have used the mergefromtrunk.sh script then you log message might have looked like as shown below: If you will see the script then it also reads the log message from the trunk revision from which you are merging code to the release branch. -------------------------- Applied fix from trunk for revision: 827730 Freemarker does not reset values each time thru a loop, so reset billTo and billFrom to empty. -------------------------- It appears that there is some problem with the script.
