subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Johan Corveleyn <jcor...@gmail.com>
Subject Re: Merge order affects final result for repeated added & deleted changes
Date Mon, 05 Aug 2013 21:31:01 GMT
On Mon, Aug 5, 2013 at 4:20 PM, Fredrik Orderud <forderud@gmail.com> wrote:
> There seems to be a problem with the merge logic in SVN when merging
> repeated added & deleted changes out-of-order.
>
> Example activity on branch A:
> r1: A new file is added.
> r2: A line is added
> r3: The line is removed
> r4: The line is re-added
> Later activity on branch B (created from A@r1):
> r5: r2 and r4 are merged in.
> r6: r3 is merged in.
>
> What happens in r5 is that repeated merging of the same change does _not_
> cause duplication or merge conflict. Instead, r4 seems to be ignored. The
> end result after r6 (a complete merge) is that r4 is missing from branch B.
> This is inconsistent with svn:mergeinfo which claims that it has been
> merged. Patches to reproduce are attached.
>
> Could it be possible to make svn merges fail on repeated merges of the same
> change, instead of just ignoring them?
>
> The problem was reproduced using svn 1.8.1 (command-line) client on Win7
> 64bit SP1, and svn server 1.7.6 (VisualSVN 2.5.6, Apache 2.2.22) on Win
> server 2008 R2.
>

I can't offer much real help, but ... I've read something similar before ...

Ah, here it is:

    http://svn.haxx.se/dev/archive-2013-04/0205.shtml

a somewhat recent thread on the dev-list. It's quite an interesting
discussion IMO, so at least this gives you some context, and confirms
that this is known behavior.

-- 
Johan

Mime
View raw message