Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-4187

Reintegrate merging with sparse checkouts

    XMLWordPrintableJSON

    Details

    • Type: Improvement
    • Status: Open
    • Priority: Critical
    • Resolution: Unresolved
    • Affects Version/s: 1.7.x
    • Fix Version/s: nonblocking
    • Component/s: unknown
    • Labels:
      None

      Description

      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.
      

      Original issue reported by bgneal

        Attachments

        1. 2_out.txt
          3 kB
          Subversion Importer
        2. 1_sparse-merge.bat
          4 kB
          Subversion Importer

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              subversion-importer Subversion Importer
            • Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

              • Created:
                Updated: