Re: diff3 merging behaviors

Ben Collins-Sussman <sussman@collab.net> writes:

> 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.

I haven't been following the discussion, but that merge behaviour
strikes me as perfectly reasonable. Consider the 1.2.x STATUS file:

  * r15157, r15175
    Fix Issue #2343: svn_io_copy_dir_recursively is broken
    Justifcation:
      Prevents a rather simple operation from completing if the
      source path contains the same name as the destination.
    Notes:
      r15175 is a small formatting fix.
    Votes:
      +1: jszakmeister
      +1: kfogel (r15157 only)

The second revision will only apply on top of the local mods produced
by the first revision.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org