svn commit: r1703581 - /subversion/trunk/subversion/svn/conflict-callbacks.c

[ph...@apache.org]

Author: philip
Date: Thu Sep 17 11:43:50 2015
New Revision: 1703581

URL: http://svn.apache.org/r1703581
Log:
In the interactive conflict resolver: allow users to
choose 'r', i.e. mark resolved, for binary files without
first looking at a diff as looking at a diff is not
possible for binary files.

* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Allow 'r' for binary files.

Modified:
    subversion/trunk/subversion/svn/conflict-callbacks.c

Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1703581&r1=1703580&r2=1703581&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Thu Sep 17 11:43:50 2015
@@ -797,7 +797,7 @@ handle_text_conflict(svn_wc_conflict_res
         }
       else
         {
-          if (knows_something)
+          if (knows_something || is_binary)
             *next_option++ = "r";
 
           /* The 'mine-full' option selects the ".mine" file so only offer
@@ -1014,7 +1014,7 @@ handle_text_conflict(svn_wc_conflict_res
              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,