svn commit: r1574458 - /subversion/trunk/subversion/svn/util.c

[st...@apache.org]

Author: stsp
Date: Wed Mar  5 12:47:05 2014
New Revision: 1574458

URL: http://svn.apache.org/r1574458
Log:
* subversion/svn/util.c
  (svn_cl__merge_file_externally): When the merge tool fails to run, include
    the path to the merge tool in the error message, not just the exit code.

Modified:
    subversion/trunk/subversion/svn/util.c

Modified: subversion/trunk/subversion/svn/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/util.c?rev=1574458&r1=1574457&r2=1574458&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/util.c (original)
+++ subversion/trunk/subversion/svn/util.c Wed Mar  5 12:47:05 2014
@@ -164,9 +164,9 @@ svn_cl__merge_file_externally(const char
      * is OK to continue with the merge.
      * Any other exit code means there was a real problem. */
     if (exitcode != 0 && exitcode != 1)
-      return svn_error_createf
-        (SVN_ERR_EXTERNAL_PROGRAM, NULL,
-         _("The external merge tool exited with exit code %d"), exitcode);
+      return svn_error_createf(SVN_ERR_EXTERNAL_PROGRAM, NULL,
+        _("The external merge tool '%s' exited with exit code %d."),
+        merge_tool, exitcode);
     else if (remains_in_conflict)
       *remains_in_conflict = exitcode == 1;
   }