Stefan Hett created SVN-4649:
--------------------------------
Summary: ile obstruction upon merge of an already merged
added/moved file
Key: SVN-4649
URL: https://issues.apache.org/jira/browse/SVN-4649
Project: Subversion
Issue Type: Bug
Affects Versions: 1.9.4, 1.9.0, 1.8.16, 1.8.14
Environment: Windows 10 (64-bit - build 1115)
Reporter: Stefan Hett
Attachments: test_obstruction.bat, test_obstruction_min.bat
The attached repro script demonstrates a case where a merge produces the
following error:
"local file obstruction, incoming file add upon merge" when performing a cherry
pick merge of a branch back to trunk on a revision which was merged from trunk
to the branch.
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-1): "local file obstruction, incoming file add upon merge"
Expected result:
Merges without problem
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 a operative
revision)).
- test_obstruction_min.bat is a reduced variation of the original test case,
triggering the same behavior without a rename operation.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
