[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: Pete Harlan <pchpublic88_at_gmail.com>
Date: Mon, 14 Sep 2015 10:41:48 -0700

On Mon, Sep 14, 2015 at 3:03 AM, Bert Huijben <bert_at_qqmail.nl> wrote:
>> 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.
...
> The Subversion developer responsible for choosing this UI determined that it
> didn't make much sense to offer two different resolve options with exactly the
> same result.

Perhaps a user or script wants to resolve a merge of some files in
favor of their versions, regardless of whether the file is binary.

You're now requiring that user or script to consider binary-ness in
order to use the UI, no?

--Pete
Received on 2015-09-14 19:42:47 CEST

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