subversion-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Evgeny Kotkov (JIRA)" <j...@apache.org>
Subject [jira] [Resolved] (SVN-4647) svn resolve --accept=mf fails on binary file
Date Tue, 29 Nov 2016 16:37:58 GMT

     [ https://issues.apache.org/jira/browse/SVN-4647?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]

Evgeny Kotkov resolved SVN-4647.
--------------------------------
       Resolution: Fixed
    Fix Version/s:     (was: 1.10.0)
                   1.9.5
                   trunk

> 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
>             Fix For: trunk, 1.9.5
>
>         Attachments: binary_resolve_issue_repro.zip
>
>
> 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)

Mime
View raw message