Merge bringing in much more than the specified changes

I've just come across a very strange merge glitch; I don't recall
seeing anything like it reported and I'm not sure if I'm just doing
something wrong or not.

$ svn --version
svn, version 1.6.15 (r1038135)

(from the RPMForge repo, on CentOS 5)

I have a project that is very close to a new stable release, but I've
also had a couple of bugs reported that I've fixed in /trunk and I'm
backporting to /branches/stable in the meantime.

I just tried merging the commits for one of these bugfixes, but I'm
getting a lot more code merged than I see from svn diff -c on the
relevant revisions.

The repository is public at https://secure.deepnet.cx/svn/dnsadmin; I'm
trying to merge revisions 417 and 418 from /trunk to /branches/stable.

Merging r417 I end up with an extra ~150 new lines in the third fragment
- not part of the commit in r417, so far as I can see, and which I'm
pretty sure was committed quite a while ago (before ~r330 or so).

-kgd
Received on 2012-10-10 19:04:40 CEST