merges

[Daniel Berlin]

On Wed, 11 Jan 2006, Bernd Schmidt wrote:

> Joern RENNECKE wrote:
>> Your merges are spamming the bugzilla database and anybody who is on the CC 
>> list of the affected bugs.
>> both 20470 and 19199 got 1.2 Megabytes of ChangeLog.
>
> Argh.  That's a side effect of the merge script I wasn't expecting. What do I 
> need to do to fix this, and what exactly is causing it?

Don't use the silly huge changelog commit message it generates (IE the -F 
svnmerge-commit.txt part), just do an svn commit and write a log message 
of "merged from mainline".

  >
>
> Bernd
>