* subversion/libsvn_client/conflicts.c
(resolve_incoming_delete_accept): Ignore 'WC_PATH_NOT_FOUND' error from
svn_wc_delete(). We want the path deleted and gone, so if it's not a
versioned item then that's just fine.
Makes the 'accept incoming deletion' option work for conflict vitims
with an incoming delete which are already missing from the WC (such
that 'svn status' shows '!' for them).
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1751896 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/libsvn_client/conflicts.c b/subversion/libsvn_client/conflicts.c
index c774c39..0d6de3f 100644
--- a/subversion/libsvn_client/conflicts.c
+++ b/subversion/libsvn_client/conflicts.c
@@ -6257,7 +6257,19 @@
ctx->notify_func2, ctx->notify_baton2,
scratch_pool);
if (err)
- goto unlock_wc;
+ {
+ if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
+ {
+ /* Not a versioned path. This can happen if the victim has already
+ * been deleted in our branche's history, for example. Either way,
+ * the item is gone, which is what we want, so don't treat this as
+ * a fatal error. */
+ svn_error_clear(err);
+ err = SVN_NO_ERROR;
+ }
+ else
+ goto unlock_wc;
+ }
if (ctx->notify_func2)
ctx->notify_func2(ctx->notify_baton2,
