subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1782452 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Fri, 10 Feb 2017 11:28:03 GMT
Author: stsp
Date: Fri Feb 10 11:28:03 2017
New Revision: 1782452

URL: http://svn.apache.org/viewvc?rev=1782452&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (resolve_incoming_move_dir_merge): Improve error message shown if common
   ancestor can't be found: Show the exact repository path@revision locations
   we are trying to correlate.

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=1782452&r1=1782451&r2=1782452&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Feb 10 11:28:03 2017
@@ -8002,14 +8002,12 @@ resolve_incoming_move_dir_merge(svn_clie
     {
       err = svn_error_createf(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
                               _("Cannot resolve tree conflict on '%s' "
-                                "(could not find common ancestor of '%s' "
-                                " and '%s')"),
+                                "(could not find common ancestor of '^/%s@%ld' "
+                                " and '^/%s@%ld')"),
                               svn_dirent_local_style(local_abspath,
                                                      scratch_pool),
-                              svn_dirent_local_style(victim_repos_relpath,
-                                                     scratch_pool),
-                              svn_dirent_local_style(moved_to_abspath,
-                                                     scratch_pool));
+                              victim_repos_relpath, victim_peg_rev,
+                              moved_to_repos_relpath, moved_to_peg_rev);
       goto unlock_wc;
     }
 



Mime
View raw message