[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 3648]  2-URL merges incorrectly reverse-merge mergeinfo for
From:       pburba () tigris ! org
Date:       2010-06-25 16:26:40
Message-ID: 20100625162640.CEA9C54006D () sc157-tigr ! sjc ! collab ! net
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=3648



User pburba changed the following:

                What    |Old value                 |New value
================================================================================
             Assigned to|issues@subversion         |pburba
--------------------------------------------------------------------------------
        Target milestone|---                       |1.6.13
--------------------------------------------------------------------------------




------- Additional comments from pburba@tigris.org Fri Jun 25 09:26:35 -0700 2010 -------
There is a simpler way to reproduce this bug:

1) Branch trunk@N to feature-branch-1 and feature-branch-2.

2) Do some work on feature-branch-1 in rM.

3) Sync merge trunk to feature-branch-1 in rX.
   Now trunk and feature-branch-1 differ only
   by the change made in rM.

4) Do some work on trunk in rY (not really required but
   keeps this example plausible).

5) 3) Sync merge trunk to feature-branch-2 in rZ.

6) Now merge ^/trunk@M ^/feature-branch@HEAD feature-branch-2-WC

This merge should only apply the change made in rM (step 2) along with the
addition of mergeinfo '/feature-branch-1:(N+1)-HEAD' describing the history of
feature-branch-1 that has been merged into feature-branch-2.  Instead what is
happening is that the mergeinfo '/trunk:(N+1)-M' is reverse merged from
feature-branch-2, even though we merged and committed it already in step 5.

If that is too abstract :-) I added a new merge_reintegrate test that
demonstrates this exact scenario in
http://svn.apache.org/viewvc?view=revision&revision=958024

Assigning to myself and setting target milestone to 1.6.13.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=2626018

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@subversion.tigris.org].
[prev in list] [next in list] [prev in thread] [next in thread]