tree 4f154bdc1b07a2c9928fe9ab7974a87f85d16a08
parent 746dbb33a637382e2550332f24540c0e811bcc86
author Stefan Sperling <stsp@apache.org> 1467981627 +0000
committer Stefan Sperling <stsp@apache.org> 1467981627 +0000

* 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