subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1358117 - /subversion/trunk/subversion/svn/file-merge.c
Date Fri, 06 Jul 2012 11:04:15 GMT
Author: stsp
Date: Fri Jul  6 11:04:14 2012
New Revision: 1358117

URL: http://svn.apache.org/viewvc?rev=1358117&view=rev
Log:
* subversion/svn/file-merge.c
  (edit_chunk): If no editor could be found, print the correct error message
   even if error tracing is enabled. This used to print "traced call" and now
   prints the expected message for SVN_ERR_CL_NO_EXTERNAL_EDITOR.

Modified:
    subversion/trunk/subversion/svn/file-merge.c

Modified: subversion/trunk/subversion/svn/file-merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/file-merge.c?rev=1358117&r1=1358116&r2=1358117&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/file-merge.c (original)
+++ subversion/trunk/subversion/svn/file-merge.c Fri Jul  6 11:04:14 2012
@@ -413,8 +413,10 @@ edit_chunk(apr_array_header_t **merged_c
                                      config, scratch_pool);
   if (err && (err->apr_err == SVN_ERR_CL_NO_EXTERNAL_EDITOR))
     {
+      svn_error_t *root_err = svn_error_root_cause(err);
+
       SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "%s\n",
-                                  err->message ? err->message :
+                                  root_err->message ? root_err->message :
                                   _("No editor found.")));
       svn_error_clear(err);
       *merged_chunk = NULL;
@@ -423,8 +425,10 @@ edit_chunk(apr_array_header_t **merged_c
     }
   else if (err && (err->apr_err == SVN_ERR_EXTERNAL_PROGRAM))
     {
+      svn_error_t *root_err = svn_error_root_cause(err);
+
       SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "%s\n",
-                                  err->message ? err->message :
+                                  root_err->message ? root_err->message :
                                   _("Error running editor.")));
       svn_error_clear(err);
       *merged_chunk = NULL;



Mime
View raw message