Author: rhuijben
Date: Sun Feb 8 11:01:27 2015
New Revision: 1658148
URL: http://svn.apache.org/r1658148
Log:
* subversion/svn/resolve-cmd.c
(svn_cl__resolve): Return a sensible error code. There is nothing externals
related here.
Modified:
subversion/trunk/subversion/svn/resolve-cmd.c
Modified: subversion/trunk/subversion/svn/resolve-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/resolve-cmd.c?rev=1658148&r1=1658147&r2=1658148&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/resolve-cmd.c (original)
+++ subversion/trunk/subversion/svn/resolve-cmd.c Sun Feb 8 11:01:27 2015
@@ -123,7 +123,7 @@ svn_cl__resolve(apr_getopt_t *os,
svn_pool_destroy(iterpool);
if (had_error)
- return svn_error_create(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS, NULL,
+ return svn_error_create(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL,
_("Failure occurred resolving one or more "
"conflicts"));
