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

List:       subversion-issues
Subject:    [Issue 4481] New - automatic merge confused by missing subtree merge
From:       philip () tigris ! org
Date:       2014-03-20 17:00:27
Message-ID: iz4481 () subversion ! tigris ! org
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=4481
                 Issue #|4481
                 Summary|automatic merge confused by missing subtree merge
               Component|subversion
                 Version|trunk
                Platform|All
                     URL|
              OS/Version|All
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|libsvn_client
             Assigned to|issues@subversion
             Reported by|philip






------- Additional comments from philip@tigris.org Thu Mar 20 10:00:27 -0700 2014 -------
Start with a branch ^/B1 that has subtree mergeinfo on ^/B1/S1 and ^/B1/S1.

Copy ^/B1 to ^/B3 and make changes in ^/B1/S1 and ^/B3/S1.

Now do a catch-up merge on ^/B3 and reintegrate merge to ^/B1, no additional
mergeinfo is recorded on S2.

Finally attempt to keepalive ^/B3 by doing another catchup merge from ^/B1. 
This merge fails to run complaining about missing mergeinfo on S1.

Script below, the final merge fails with:

svn: E195016: Reintegrate can only be used if revisions 6 through 10 were
previously merged from file:///home/pm/sw/subversion/obj/repo/B3 to the
reintegrate source, but this is not the case:
  B1/S1
    Missing ranges: /B1/S1:7

What makes this really confusing is that the catchup merge from B1 to B3 does
not record mergeinfo on B3/S2 because there are no changes in S2. If we do an
explicit subtree merge to force mergeinfo to be recorded then the error about a
missing merge on S1 goes away. It's all very confusing. 

Reported here:
http://mail-archives.apache.org/mod_mbox/subversion-users/201403.mbox/%3C5318AD17.4070506@inforay.nl%3E
http://svn.haxx.se/users/archive-2014-03/0049.shtml

#!/bin/sh

rm -rf repo wc
svnadmin create repo --compatible-version 1.8
url=file://`pwd`/repo/
svn mkdir -mm $url/B1 ^/B1/S1 ^/B1/S2
svn cp -mm $url/B1 ^/B2
svn mkdir -mm $url/B2/S1/M1 ^/B2/S2/M1
svn co $url/B1 wc
svn merge ^/B2/S1 wc/S1
svn merge ^/B2/S2 wc/S2
svn ci -mm wc
svn rm -mm $url/B2
svn cp -mm $url/B1 ^/B3
svn mkdir -mm $url/B1/S1/M2
svn mkdir -mm $url/B3/S1/M3
svn sw ^/B3 wc
svn merge ^/B1 wc         # problem merge?
# svn merge ^/B1/S2 wc/S2 # fixed by this merge?
svn ci -mm wc
svn sw ^/B1 wc
svn merge ^/B3 wc
svn ci -mm wc
svn sw ^/B3 wc
svn merge ^/B1 wc

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

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