RE: Re: Re: Unexpected successful merge in a conflict

Now I realized that the problem is more serious than I thought. I feel that the SVN branching and merging/integration algorithm is flawed. However I am not sure if this is a known limitation of SVN. I did 2 tests to compare SVN against Perforce. The intention of the test is to see if a change done by a user at some point in time and taken to multiple branches comes back to the main branch duplicated multiple times without indicating a conflict.

Test 1:
-------

            Integrate B1 back to main
              +--------------+
              | V
Main -> Branch1 -> Branch2 Main Main
a a a a a a a
b b b b b b b
c c c c x c x
z z d d d d d
             z z z z d
                        | z
                        | ^
                        +-----------+
                    Integrate B2 back to main

In Perforce the result is (without conflict)
a
b
e
d
z

Test 2:
-------

            Integrate B1 back to main
              +--------------+
              | V
Main -> Branch1 -> Branch2 Main Main
a a a a a a a a
b b b b d d b d
c c c c z b c b
z z d d c d c
             z z z z d
                         | z
                         | ^
                         +-----------+
                    Integrate B2 back to main

In Perforce the result is (without conflict)
a
d
b
c
z

Looking at test 2, may be I am wrong when I told before that choosing a distance of 0 was the source of the problem. May there be problem in the core of the merging/integration algorithm? Does SVN do a simple 3-way merge during integration?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2993403

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-07-27 13:35:14 CEST