Stefan Hett created SVN-4647:
--------------------------------
Summary: svn resolve --accept=mf fails on binary file
Key: SVN-4647
URL: https://issues.apache.org/jira/browse/SVN-4647
Project: Subversion
Issue Type: Bug
Components: cmdline client
Affects Versions: 1.9.4
Reporter: Stefan Hett
Steps to reproduce:
1. Create a repository and add a binary file to trunk.
2. Create a branch.
3. Modify the binary file in the branch and commit.
4. Modify the binary file in trunk and commit.
5. Merge the branch back into the trunk
6. Select to resolve the merge conflict later
7. run svn resolve --accept=mf <file>
Actual result:
svn: warning: W155027: Conflict on '<file>' could not be resolved because the
chosen version of the file is not available.
svn: E155027: Failure occurred resolving one or more conflicts
Expected result:
Conflict is resolved using the local (current) binary file.
Note: This is the command-line repro step of the issue investigated in TSVN
here: http://svn.haxx.se/dev/archive-2016-07/0020.shtml
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
