On Wed, 11 Jan 2006, Bernd Schmidt wrote:
Giovanni Bajo wrote:
Bernd Schmidt <[EMAIL PROTECTED]> 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?
You can avoid quoting ChangeLogs of patches your merge within your
branches'
ChangeLog. When working in development branches, usually ChangeLog files
are
not updated for merges, and commit entries are mostly like "merging from
trunk
up to revision NNNN". In other words, don't use svnmerge's generated commit
text file.
Is it the commit message that's causing the problem, or the merged ChangeLog
contents themselves?
Commit messages.
The merge script relies only on the svnmerge-integrated
property, not on the commit messages?
Right.
It's just trying to generate a nice message for you, but in our world, the
messages are so huge as to be useless.
Bernd
