Ben Collins-Sussman <sussman@collab.net> writes:
> # 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
Note that in addition to the small change to ChangeLog, there are also
minor changes to other files in this diff. (That doesn't matter for
this recipe, I'm just warning people.)
> # 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.
With SVN trunk r12206, I don't get a huge conflict. I get this at the
top of ChangeLog:
<<<<<<< .working
=======
Tue Dec 7 10:06:39 CET 2004 Paolo Molaro <lupus@ximian.com>
* exceptions-ppc.c: avoid calling ppc_patch in exception \
trampolines.
2004-12-01 Neale Ferguson <Neale.Ferguson@SoftwareAG-usa.com>
>>>>>>> .merge-right.r37303
Tue Dec 7 11:44:39 CET 2004 Paolo Molaro <lupus@ximian.com>
* mini-ppc.c, objectc.cs: handle large structs passed by value
(fixes bug #69972).
Note that I indented the whole quote by three spaces for offset
clarity, then backslashed one line to avoid ugly wrapping. Otherwise,
it's exactly as it appears in my working copy. The rest of the
ChangeLog continues from that point just as it is in the working copy,
with no more conflict markers.
The above looks quite plausible, given the diff and the target data.
> 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?
Can you say exactly what you saw, that caused you to describe a "huge
conflict"?
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Dec 8 03:08:40 2004