svn commit: r1739805 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[st...@apache.org]

Author: stsp
Date: Mon Apr 18 18:21:45 2016
New Revision: 1739805

URL: http://svn.apache.org/viewvc?rev=1739805&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_tree_get_resolution_options): In the description of
   the svn_client_conflict_option_merge_incoming_added_file_text_merge option,
   show the file's path relative to the working copy root, instead of showing
   its basename.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1739805&r1=1739804&r2=1739805&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Apr 18 18:21:45 2016
@@ -3998,6 +3998,7 @@ svn_client_conflict_tree_get_resolution_
   const char *incoming_new_repos_relpath;
   svn_revnum_t incoming_new_pegrev;
   svn_node_kind_t incoming_new_kind;
+  const char *wcroot_abspath;
 
   operation = svn_client_conflict_get_operation(conflict);
   local_change = svn_client_conflict_get_local_change(conflict);
@@ -4008,6 +4009,10 @@ svn_client_conflict_tree_get_resolution_
             &incoming_new_kind, conflict, scratch_pool,
             scratch_pool));
 
+  SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, conflict->ctx->wc_ctx,
+                             conflict->local_abspath, scratch_pool,
+                             scratch_pool));
+
   SVN_ERR(assert_tree_conflict(conflict, scratch_pool));
 
   *options = apr_array_make(result_pool, 2,
@@ -4096,8 +4101,11 @@ svn_client_conflict_tree_get_resolution_
             svn_client_conflict_option_merge_incoming_added_file_text_merge;
           option->description =
             apr_psprintf(result_pool,
-              _("merge the file '%s' with '^/%s@%ld'"),
-              svn_dirent_basename(conflict->local_abspath, scratch_pool),
+              _("merge file '%s' with '^/%s@%ld'"),
+              svn_dirent_local_style(
+                svn_dirent_skip_ancestor(wcroot_abspath,
+                                         conflict->local_abspath),
+                scratch_pool),
               incoming_new_repos_relpath, incoming_new_pegrev);
           option->conflict = conflict;
           option->do_resolve_func =