You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by iv...@apache.org on 2015/10/26 11:40:18 UTC
svn commit: r1710558 - /subversion/trunk/subversion/libsvn_client/externals.c
Author: ivan
Date: Mon Oct 26 10:40:18 2015
New Revision: 1710558
URL: http://svn.apache.org/viewvc?rev=1710558&view=rev
Log:
Follow-up to r1705843: Improve error message in some edge cases. For example
if svn_wc__external_remove() function returns SVN_ERR_CANCELLED.
* subversion/libsvn_client/externals.c
(switch_dir_external): Return error from svn_wc__external_remove() as-is
instead of chaining to SVN_ERR_WC_PATH_UNEXPECTED_STATUS error.
Modified:
subversion/trunk/subversion/libsvn_client/externals.c
Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1710558&r1=1710557&r2=1710558&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Mon Oct 26 10:40:18 2015
@@ -252,8 +252,10 @@ switch_dir_external(const char *local_ab
svn_error_clear(err);
err = NULL;
}
+ else if (err)
+ return svn_error_trace(err);
- return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, err,
+ return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
_("The external '%s' defined in %s at '%s' "
"cannot be checked out because '%s' is "
"already a versioned path."),