[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: 1.9 - Can't resolve to 'mine full' option for binary file conflict

From: Stefan Hett <stefan_at_egosoft.com>
Date: Mon, 14 Sep 2015 09:53:45 +0200

On 9/14/2015 7:56 AM, Daniel Becroft wrote:
> Hi guys,
>
>
> I've just upgraded to SVN 1.9. One of the first things I noticed is
> that when a binary file conflict is raised during an SVN update, I can
> no longer use the 'mine-full' option to resolve.
>
> The only options I have are: (r) working and (tf) theirs-full.
>
> I can't use the 'r' (working) option, as I get a message of "Invalid
> option; use diff/edit/merge/launch before choosing 'mark resolved'.
>
> If I postpone, and try resolving afterwards, I get the following errors;
> > svn resolve file.binary --accept mine-full
> svn: warning: W155027: Conflict on 'file.binary' could not be resolved
> because the chosen version of the file is not available.
> svn: E155027: Failure occurred resolving one or more conflicts
>
> I can't find anything in the release notes about the removal of the
> 'mine-full' option on binary files. Was it intentional? If so, what's
> the intended workflow for resolution?
>
> Current version:
> svn, version 1.9.0-SlikSvn (SlikSvn/1.9.0)
> compiled Aug 26 2015, 17:09:55 on x86/x86_64-microsoft-windows6.2.9200
>
> Cheers,
> Daniel B.
Hi Daniel,

just to second ur observation:
I think I ran into the same problem last Thursday/Friday using TSVN
1.9.1. I didn't report it yet because I didn't check out whether it's a
TSVN or an SVN issue.
Using TSVN, it however also gives me the "file not found" error when I
try to resolve a binary conflict selecting "Use Repository version"
during the merge dialog.

I'm sure u are already ware, but just in case: My workaround was to let
the file in conflict and afterwards resolve the conflict by reverting
the file (so it was in the repository's state which I intended).

-- 
Regards,
Stefan Hett
Received on 2015-09-14 09:53:59 CEST

This is an archived mail posted to the Subversion Users mailing list.