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

file obstruction upon merge of an already merged added/moved file

    XMLWordPrintableJSON

    Details

    • Type: Bug
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: 1.8.14, 1.8.19, 1.9.0, 1.9.7
    • Fix Version/s: None
    • Component/s: None
    • Labels:
      None
    • Environment:

      Windows 10 (64-bit - build 1115)

      Description

      The attached repro script demonstrates a case where a cherry-pick merge produces the following error:
      "local file obstruction, incoming file add upon merge"

      Steps to reproduce:
      Run the attached repro script: test_obstruction.bat

      Actual result:
      svn merge file:///D:/testRepo/branches/testBranch trunk -c7 causes the error (output with 1.9.4): "local file obstruction, incoming file add upon merge"

      Expected result:
      Merges without problem

      This is unexpected IMO, since all the merge does is merge back the addition/renaming of a file which was merged before from trunk.

      Notes:

      • The repro script creates a test repo/wc on drive D.
      • The issue is not reproducible when not using a cherry pick merge (aka: doesn't happen when setting the operative revision via @ and also doesn't happen when doing a complete merge (aka: neither specifying a revision, nor an operative revision)).
      • test_obstruction_min.bat is a reduced variation of the original test case, triggering the same behavior without a rename operation.

        Attachments

        1. test_obstruction.bat
          1 kB
          Stefan Hett
        2. test_obstruction_min.bat
          1.0 kB
          Stefan Hett

          Activity

            People

            • Assignee:
              luke1410 Stefan Hett
              Reporter:
              luke1410 Stefan Hett
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated: