[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Merge order affects final result for repeated added & deleted changes

From: Fredrik Orderud <forderud_at_gmail.com>
Date: Mon, 5 Aug 2013 16:20:55 +0200

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

Thanks in advance,
Fredrik Orderud

Received on 2013-08-05 16:21:31 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.