* 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).
* 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: f8a4e5e023278da1e04e203c7fe051e3c4285d88@1751896 13f79535-47bb-0310-9956-ffa450edef68

YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion,YueLinHo/Subversion