'svn merge' vs. diff/patch

I was talking with Paolo (one of the main Mono developers) in IRC
today. He sees this curious behavior, when trying to port a small
change from trunk to a branch:

# check out a branch wc
svn co svn://svn.myrealbox.com/source/branches/mono-1-0/mono/mono/mini

# examine the patch on trunk (this shows a tiny addition to 'ChangeLog')
svn diff -r37302:37303
svn://svn.myrealbox.com/source/trunk/mono/mono/mini

# now apply the same patch to the wc:
svn merge -r37302:37303
svn://svn.myrealbox.com/source/trunk/mono/mono/mini

... the merge results in a huge conflict within 'ChangeLog', rather
than just a tiny 3-line addition as 'svn diff' predicted.

What's going on here? Is it the fact that 'svn diff' is doing a
two-way diff, but 'svn merge' is doing a three-way diff? Could that
cause this?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Dec 7 20:43:38 2004