Author: stsp
Date: Tue Mar 17 10:42:24 2015
New Revision: 1667249
URL: http://svn.apache.org/r1667249
Log:
* subversion/svn/conflict-callbacks.c
(handle_text_conflict): Don't allow diffs for binary files.
This restores the 'mine-full' and 'theirs-full' options for binary files,
which since r1667228 had no options other than 'edit' and 'postpone'.
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=1667249&r1=1667248&r2=1667249&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Tue Mar 17 10:42:24
2015
@@ -703,8 +703,9 @@ handle_text_conflict(svn_wc_conflict_res
markers to the user (this is the typical 3-way merge
scenario), or if no base is available, we can show a diff
between mine and theirs. */
- if ((desc->merged_file && desc->base_abspath)
- || (!desc->base_abspath && desc->my_abspath && desc->their_abspath))
+ if (!desc->is_binary &&
+ ((desc->merged_file && desc->base_abspath)
+ || (!desc->base_abspath && desc->my_abspath && desc->their_abspath)))
diff_allowed = TRUE;
while (TRUE)
@@ -731,11 +732,8 @@ handle_text_conflict(svn_wc_conflict_res
if (knows_something)
*next_option++ = "r";
- if (! desc->is_binary)
- {
- *next_option++ = "mc";
- *next_option++ = "tc";
- }
+ *next_option++ = "mc";
+ *next_option++ = "tc";
}
else
{
