Affects Version/s: 1.8.14, 1.8.19, 1.9.0, 1.9.7
Fix Version/s: None
Windows 10 (64-bit - build 1115)
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
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"
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.
- 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.