commit 1ec204733379f634e2704e1a08fe9833b78e0249
author Stefan Sperling <stsp@apache.org> Fri Jul 08 16:08:52 2016 +0000
committer Stefan Sperling <stsp@apache.org> Fri Jul 08 16:08:52 2016 +0000
tree 124086d588bd9cdaf35b2f1027986074e9fdb23e
parent bc510b9cc94217ce409e6fe9abc01cbbdbff59f1

* subversion/libsvn_client/conflicts.c
  (resolve_incoming_delete_accept): If deleting the node fails because it
   is not versioned, we must clear the tree conflict marker manually.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1751935 13f79535-47bb-0310-9956-ffa450edef68

subversion/libsvn_client/conflicts.c

diff --git a/subversion/libsvn_client/conflicts.c b/subversion/libsvn_client/conflicts.c
index 7d8cd00..0113070 100644
--- a/subversion/libsvn_client/conflicts.c
+++ b/subversion/libsvn_client/conflicts.c
@@ -6135,9 +6135,13 @@
            * 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;
+
+          /* Resolve to current working copy state. */
+          err = svn_wc__del_tree_conflict(ctx->wc_ctx, local_abspath,
+                                          scratch_pool);
         }
-      else
+
+      if (err)
         goto unlock_wc;
     }