subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1748522 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Date Wed, 15 Jun 2016 08:45:12 GMT
Author: stsp
Date: Wed Jun 15 08:45:12 2016
New Revision: 1748522

URL: http://svn.apache.org/viewvc?rev=1748522&view=rev
Log:
Improve message for an error raised by the conflict resolver.

* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_text_resolve_by_id,
   svn_client_conflict_prop_resolve_by_id,
   svn_client_conflict_tree_resolve_by_id): Users won't know (nor care) what an
   'option ID' is, so don't mention this ID when an invalid option is given.

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=1748522&r1=1748521&r2=1748522&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Jun 15 08:45:12 2016
@@ -7028,8 +7028,7 @@ svn_client_conflict_text_resolve_by_id(
     return svn_error_createf(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE,
                              NULL,
                              _("Inapplicable conflict resolution option "
-                               "ID '%d' given for conflicted path '%s'"),
-                             option_id,
+                               "given for conflicted path '%s'"),
                              svn_dirent_local_style(conflict->local_abspath,
                                                     scratch_pool));
   SVN_ERR(svn_client_conflict_text_resolve(conflict, option, scratch_pool));
@@ -7075,8 +7074,7 @@ svn_client_conflict_prop_resolve_by_id(
     return svn_error_createf(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE,
                              NULL,
                              _("Inapplicable conflict resolution option "
-                               "ID '%d' given for conflicted path '%s'"),
-                             option_id,
+                               "given for conflicted path '%s'"),
                              svn_dirent_local_style(conflict->local_abspath,
                                                     scratch_pool));
   SVN_ERR(svn_client_conflict_prop_resolve(conflict, propname, option,
@@ -7172,8 +7170,7 @@ svn_client_conflict_tree_resolve_by_id(
     return svn_error_createf(SVN_ERR_CLIENT_CONFLICT_OPTION_NOT_APPLICABLE,
                              NULL,
                              _("Inapplicable conflict resolution option "
-                               "ID '%d' given for conflicted path '%s'"),
-                             option_id,
+                               "given for conflicted path '%s'"),
                              svn_dirent_local_style(conflict->local_abspath,
                                                     scratch_pool));
   SVN_ERR(svn_client_conflict_tree_resolve(conflict, option, scratch_pool));



Mime
View raw message