You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/03/17 11:46:53 UTC
svn commit: r1667250 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Tue Mar 17 10:46:53 2015
New Revision: 1667250
URL: http://svn.apache.org/r1667250
Log:
* subversion/svn/conflict-callbacks.c
(handle_text_conflict): Clearly identify a binary file as 'binary' in the
conflict menu prompt.
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=1667250&r1=1667249&r2=1667250&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Tue Mar 17 10:46:53 2015
@@ -686,14 +686,22 @@ handle_text_conflict(svn_wc_conflict_res
/* Have they done *something* (edit, look at diff, etc) to
give them a rational basis for choosing (r)esolved? */
svn_boolean_t knows_something = FALSE;
-
+ const char *local_relpath;
+
SVN_ERR_ASSERT(desc->kind == svn_wc_conflict_kind_text);
- SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool,
- _("Conflict discovered in file '%s'.\n"),
- svn_cl__local_style_skip_ancestor(
- b->path_prefix, desc->local_abspath,
- scratch_pool)));
+ local_relpath = svn_cl__local_style_skip_ancestor(b->path_prefix,
+ desc->local_abspath,
+ scratch_pool);;
+
+ if (desc->is_binary)
+ SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool,
+ _("Conflict discovered in binary file '%s'.\n"),
+ local_relpath));
+ else
+ SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool,
+ _("Conflict discovered in file '%s'.\n"),
+ local_relpath));
/* ### TODO This whole feature availability check is grossly outdated.
DIFF_ALLOWED needs either to be redefined or to go away.