subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1680526 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Date Wed, 20 May 2015 11:28:17 GMT
Author: stsp
Date: Wed May 20 11:28:17 2015
New Revision: 1680526

URL: http://svn.apache.org/r1680526
Log:
Follow-up to r1680523:

* subversion/svn/conflict-callbacks.c
  (handle_tree_conflict): Output caret notation ("^/") when displaying
   source left and source right URLs. Previous code resulted in full URLs.

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=1680526&r1=1680525&r2=1680526&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Wed May 20 11:28:17 2015
@@ -1145,14 +1145,16 @@ handle_tree_conflict(svn_wc_conflict_res
                readable_desc));
 
   src_left_version =
-              svn_cl__node_description(desc->src_left_version, "^/",
+              svn_cl__node_description(desc->src_left_version,
+                                       desc->src_left_version->repos_url,
                                        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);
+                                       desc->src_right_version->repos_url,
+                                       scratch_pool);
   if (src_right_version)
     SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "%s: %s\n",
                                 _("Source right"), src_right_version));



Mime
View raw message