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

[st...@apache.org]

Author: stsp
Date: Wed May 20 11:19:56 2015
New Revision: 1680523

URL: http://svn.apache.org/r1680523
Log:
* subversion/svn/conflict-callbacks.c
  (handle_tree_conflict): In the tree conflict menu prompt, show the
   source left and source right URLs, as shown by 'svn info'.


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=1680523&r1=1680522&r2=1680523&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed May 20 11:19:56 2015
@@ -1130,6 +1130,8 @@ handle_tree_conflict(svn_wc_conflict_res
                      apr_pool_t *scratch_pool)
 {
   const char *readable_desc;
+  const char *src_left_version;
+  const char *src_right_version;
   apr_pool_t *iterpool;
 
   SVN_ERR(svn_cl__get_human_readable_tree_conflict_description(
@@ -1142,6 +1144,19 @@ handle_tree_conflict(svn_wc_conflict_res
                                                  scratch_pool),
                readable_desc));
 
+  src_left_version =
+              svn_cl__node_description(desc->src_left_version, "^/",
+                                       scratch_pool);
+  if (src_left_version)
+    SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "%s: %s\n",
+                                _("Source  left"), src_left_version));
+  src_right_version =
+              svn_cl__node_description(desc->src_right_version,
+                                       "^/", scratch_pool);
+  if (src_right_version)
+    SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "%s: %s\n",
+                                _("Source right"), src_right_version));
+
   iterpool = svn_pool_create(scratch_pool);
   while (1)
     {