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

List:       subversion-issues
Subject:    [Issue 4187] New - Reintegrate merging with sparse checkouts
From:       bgneal () tigris ! org
Date:       2012-05-23 13:39:11
Message-ID: iz4187 () subversion ! tigris ! org
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=4187
                 Issue #|4187
                 Summary|Reintegrate merging with sparse checkouts
               Component|subversion
                 Version|1.7.x
                Platform|All
                     URL|
              OS/Version|All
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|ENHANCEMENT
                Priority|P2
            Subcomponent|unknown
             Assigned to|issues@subversion
             Reported by|bgneal






------- Additional comments from bgneal@tigris.org Wed May 23 06:39:11 -0700 2012 \
------- Please see the subversion users email thread that started with this message:
http://mail-archives.apache.org/mod_mbox/subversion-users/201205.mbox/%3CCAH_gSv58Auqwm1KNxyUM4=gtfhoEXZis+Jo1Aa-WAGfnEkRN_g@mail.gmail.com%3E


I have found that merging a feature branch back to trunk doesn't work in all
cases when using sparse working copies. In the mailing list thread I attached a
.bat file that reproduces the problem which is basically:

1. Create a repo using your sample greek tree.
2. Make a sparse working copy of trunk, omitting the A\B directory (trunk_wc)
3. Copy trunk to a feature branch.
4. Make a sparse working copy of the feature branch (omitting A\B -- branch_wc)
5. Make a full working copy of trunk (trunk_b_wc).
6. Now change files in all three working copies and commit (but don't
create conflicts). In particular, in trunk_b_wc, change a file under
A\B.
7. Merge trunk to the feature branch.
8. Reintegrate merge the feature branch back to trunk.
9. Observe that the merge fails, presumably because the merge info changes to
A\B never made it to the feature branch.

The message where I attached the output and .bat file is here:
http://mail-archives.apache.org/mod_mbox/subversion-users/201205.mbox/%3CCAH_gSv6skA33XTjUx5mz7Ns3KYxAaact4zFaBJUwjNLfJWkWEw@mail.gmail.com%3E


Johan Corveleyn suggested I file an issue as a possible feature request here:
http://mail-archives.apache.org/mod_mbox/subversion-users/201205.mbox/%3CCAB84uBXVR2cmJhHrYrBcvOG5h52BbfLM-knZ9zrQyEiQMtVWwQ@mail.gmail.com%3E


Thank you.

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

To unsubscribe from this discussion, e-mail: \
[issues-unsubscribe@subversion.tigris.org].


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