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

List:       subversion-issues
Subject:    [Issue 3756] New - subtree merge can inherit invalid working
From:       pburba () tigris ! org
Date:       2010-11-18 21:49:17
Message-ID: iz3756 () subversion ! tigris ! org
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=3756
                 Issue #|3756
                 Summary|subtree merge can inherit invalid working mergeinfo
               Component|subversion
                 Version|all
                Platform|All
                     URL|
              OS/Version|All
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P4
            Subcomponent|libsvn_client
             Assigned to|issues@subversion
             Reported by|pburba






------- Additional comments from pburba@tigris.org Thu Nov 18 13:49:16 -0800 2010 -------
As mentioned in item #1 in
http://subversion.tigris.org/issues/show_bug.cgi?id=3669#desc7, a subtree merge
within an uncommitted working merge can create mergeinfo on the subtree target
that describes invalid path-revisions.

The recipe is this (assume a uniform-revision target WC):

1) Merge -rX:Y from ^/SRC to target-WC such that working mergeinfo is recorded
on target-WC describing the merge.

2) Before committing the merge in step 1 do a subtree merge under it from
^/SRC/subtree to target-WC/subtree, where the latter has *no* explicit mergeinfo
prior to this second merge.  In addition to whatever mergeinfo we record to
describe the merge, target-WC/subtree will first inherit '/SRC:X-Y'.  Great,
*except* if ^/SRC/subtree didn't exist until some revision Z, where X < Z, then
the mergeinfo '/SRC/subtree:X-(Z-1)' describes invalid path-revs (or
'/SRC/subtree:X-Y)' if Z > Y).

Test incoming for this in a moment.

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

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