/[Apache-SVN]
ViewVC logotype

Revision 1751896


Jump to revision: Previous Next
Author: stsp
Date: Fri Jul 8 12:40:27 2016 UTC (7 years, 10 months ago)
Changed paths: 1
Log Message:
* 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).


Changed paths

Path Details
Directorysubversion/trunk/subversion/libsvn_client/conflicts.c modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26