On 16.12.2015 12:41, Stefan Hett wrote:
> Hi,
>
> Steps to reproduce:
> 1. create two branches with a binary file which differs in both branches
> 2. merge the one branch into the other
> 3. On the Resolve conflict dialog select"Prefer local" to indicate that
> the current version of the file in the WC is to be kept:
>
>
> Expected behavior:
> Current file is kept and conflict is resolved.
>
> Actual result:
> Error: "Conflict on '[...]\default.bgp' could not be resolved because
> the chosen version of the file is not available.
>
> I believe this was working fine in the 1.8.x TSVN versions, but didn't
> double check (so might be wrong here).
> Also there was a possibly related change done to the SVN command line
> client in 1.9.3 as far as I recall removing the mf option from the
> binary conflict resolution option.
> (That's why I didn't report the issue here before, because I originally
> was assuming a possible SVN API fix to resolve the svn client issue -
> obviously the argument was that the API side was fine and just the
> client's usage was to be updated which was done in 1.9.3).
> If I'm not mistaken here, maybe there needs to be a corresponding change
> to the corresponding API call from TSVN to SVN?
What's the svn:mime-type property of that file? If it has the word
"text" in it, then TSVN treats it not as a binary file when trying to
resolve the conflict.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3151885
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-12-24 08:55:01 CET