[Svnmerge] [PATCH] Handle transitive merging property conflicts for both merged/blocked revs

[Dustin J. Mitchell]

On Thu, Jul 05, 2007 at 09:02:37PM -0400, Raman Gupta wrote:
> The patch simply avoids conflicts be removing the integrated/blocked
> properties altogether before calling merge, and then resets them to
> their known values after the merge is complete.

If I understand correctly, this basically means that there will be a
property conflict on almost every merge, but those conflicts are ignored
and the property simply set to the correct value at the end.  I have two
concerns:

1. Why do anything with the properties if they're going to cause
conflicts and be overwritten anyway?

2. Are we losing information in this process?  That is, if we're merging
A -> B -> C, and revision r on B was a merge from A to B, then
svnmerge-integrated would change from, let's say, A:1-36,38-39 to
A:1-39 in that revision.  In merging revision r to C, doesn't it seem
reasonable to also indicate that r37 from A is now present in C?

All that said, this is a small change, and if it makes the test case
pass, then it will satisfy those folks who aren't concerned with merges
from A to C, so I'm on board with it.

Dustin

-- 
        Dustin J. Mitchell
        Storage Software Engineer, Zmanda, Inc.
        http://www.zmanda.com/