svn commit: r1751935 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[st...@apache.org]

Author: stsp
Date: Fri Jul  8 16:08:52 2016
New Revision: 1751935

URL: http://svn.apache.org/viewvc?rev=1751935&view=rev
Log:
* 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.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1751935&r1=1751934&r2=1751935&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Fri Jul  8 16:08:52 2016
@@ -6135,9 +6135,13 @@ resolve_incoming_delete_accept(svn_clien
            * 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;
     }