diff3 merging behaviors (was Re: svn commit: r15164 - trunk/notes)

On Jun 27, 2005, at 11:08 AM, Ben Collins-Sussman wrote:

>
> Rather than get ourselves all tangled in merge-tracking design, I
> think I'll just imitate this behavior when merging properties. We
> can always get more sophisticated later on.
>

Hm, things are uglier than I suspected with our current diff3 text-
merging.

cmpilato and I were discussing a scenario where the server wants to
change a single line of text from A to C, and in the working copy,
the text-base is Q, with a local mod that changes it to A.

Amazingly, 'svn merge' overwrites the existing local-mod as a clean
merge. 'svn diff' then shows Q changing into C. The original local-
mod is gone; reverting takes the line back to Q, rather than A.

Is this a known behavior? Is it bad?

It definitely points to what ghudson theorized: that our diff3
algorithm is *completely* ignoring the text-base.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jun 27 18:55:45 2005