[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: Philip Martin <philip.martin_at_wandisco.com>
Date: Mon, 14 Sep 2015 12:27:44 +0100

Philip Martin <philip.martin_at_wandisco.com> writes:

> or perhaps this:
>
> Index: ../src/subversion/svn/conflict-callbacks.c
> ===================================================================
> --- ../src/subversion/svn/conflict-callbacks.c (revision 1702397)
> +++ ../src/subversion/svn/conflict-callbacks.c (working copy)
> @@ -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,
>
>

That allows 'r' to work, but if 'r' is going to be allowed it should
probably be shown by the first prompt, so perhaps:

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,

-- 
Philip Martin
WANdisco
Received on 2015-09-14 13:28:07 CEST

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