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

[st...@apache.org]

Author: stsp
Date: Sat May 12 12:29:43 2012
New Revision: 1337520

URL: http://svn.apache.org/viewvc?rev=1337520&view=rev
Log:
* subversion/svn/conflict-callbacks.c
  (svn_cl__conflict_handler): Show all conflicted paths relative to the current
   directory instead of showing absolute paths. This was already done for
   tree conflicts and is now done for text and property conflicts, too.

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=1337520&r1=1337519&r2=1337520&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Sat May 12 12:29:43 2012
@@ -419,16 +419,18 @@ svn_cl__conflict_handler(svn_wc_conflict
       if (desc->kind == svn_wc_conflict_kind_text)
         SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
                                     _("Conflict discovered in '%s'.\n"),
-                                    svn_dirent_local_style(
-                                      desc->local_abspath, subpool)));
+                                      svn_cl__local_style_skip_ancestor(
+                                        b->path_prefix, desc->local_abspath,
+                                        subpool)));
       else if (desc->kind == svn_wc_conflict_kind_property)
         {
           SVN_ERR(svn_cmdline_fprintf(stderr, subpool,
                                       _("Conflict for property '%s' discovered"
                                         " on '%s'.\n"),
                                       desc->property_name,
-                                      svn_dirent_local_style(
-                                        desc->local_abspath, subpool)));
+                                      svn_cl__local_style_skip_ancestor(
+                                        b->path_prefix, desc->local_abspath,
+                                        subpool)));
 
           if ((!desc->my_abspath && desc->their_abspath)
               || (desc->my_abspath && !desc->their_abspath))
@@ -721,7 +723,9 @@ svn_cl__conflict_handler(svn_wc_conflict
                    stderr, subpool,
                    _("Conflict discovered when trying to add '%s'.\n"
                      "An object of the same name already exists.\n"),
-                   svn_dirent_local_style(desc->local_abspath, subpool)));
+                   svn_cl__local_style_skip_ancestor(b->path_prefix,
+                                                     desc->local_abspath,
+                                                     subpool)));
       prompt = _("Select: (p) postpone, (mf) mine-full, "
                  "(tf) theirs-full, (h) help:");