[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 Sperling <stsp_at_elego.de>
Date: Mon, 14 Sep 2015 15:12:36 +0200

On Mon, Sep 14, 2015 at 12:27:44PM +0100, Philip Martin wrote:
> Index: ../src/subversion/svn/conflict-callbacks.c
> ===================================================================
> --- ../src/subversion/svn/conflict-callbacks.c (revision 1702397)
> +++ ../src/subversion/svn/conflict-callbacks.c (working copy)
> @@ -796,7 +796,7 @@
> }
> else
> {
> - if (knows_something)
> + if (knows_something || is_binary)
> *next_option++ = "r";
>
> /* The 'mine-full' option selects the ".mine" file so only offer
> @@ -1013,7 +1013,7 @@
> the file if they've edited it, or at least looked at
> the diff. */
> if (opt->choice == svn_wc_conflict_choose_merged
> - && ! knows_something)
> + && ! knows_something && diff_allowed)
> {
> SVN_ERR(svn_cmdline_fprintf(
> stderr, iterpool,
>
>

I agree.

And thanks for mopping up after me ;-)
I believe I accidentally broke this in r1667692.
Received on 2015-09-14 15:13:04 CEST

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