You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/05/26 23:32:29 UTC
svn commit: r948600 - /subversion/trunk/subversion/libsvn_client/add.c
Author: rhuijben
Date: Wed May 26 21:32:29 2010
New Revision: 948600
URL: http://svn.apache.org/viewvc?rev=948600&view=rev
Log:
Removes a suspicious call to svn_wc_add4() that looks like it creates
a sparse directory, while it only creates an error message.
* subversion/libsvn_client/add.c
(add):
Create the error message previously returned by svn_wc_add4() locally.
Modified:
subversion/trunk/subversion/libsvn_client/add.c
Modified: subversion/trunk/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/add.c?rev=948600&r1=948599&r2=948600&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/add.c (original)
+++ subversion/trunk/subversion/libsvn_client/add.c Wed May 26 21:32:29 2010
@@ -515,12 +515,16 @@ add(void *baton, apr_pool_t *result_pool
}
else if (kind == svn_node_file)
err = add_file(b->local_abspath, b->ctx, scratch_pool);
+ else if (kind == svn_node_none)
+ return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
+ _("'%s' not found"),
+ svn_dirent_local_style(b->local_abspath,
+ scratch_pool));
else
- err = svn_wc_add4(b->ctx->wc_ctx, b->local_abspath, b->depth, NULL,
- SVN_INVALID_REVNUM,
- b->ctx->cancel_func, b->ctx->cancel_baton,
- b->ctx->notify_func2, b->ctx->notify_baton2,
- scratch_pool);
+ return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
+ _("Unsupported node kind for path '%s'"),
+ svn_dirent_local_style(b->local_abspath,
+ scratch_pool));
/* Ignore SVN_ERR_ENTRY_EXISTS when FORCE is set. */
if (err && err->apr_err == SVN_ERR_ENTRY_EXISTS && b->force)