* subversion/libsvn_wc/adm_ops.c (svn_wc_delete4): Following up on r1132948 and r1132919, answer my own question: We can't just remove conflict markers in a keep_local scenario, as that would remove conflict markers from the wrong directory, in case we are just changing the casing of a node on a case insensitive filesystem.
Reapply a heavily tweaked version of sbutler's patch that made svn_wc_delete4 clean up conflict marker files of deleted nodes.
Compared to the original patch in r1132834: Don't use a helper function that reimplements passing TRUE for svn_io_remove_file2's ignore_enoent. Avoid error leaks. Perform the in-db deletion before removing the marker files.
* subversion/libsvn_wc/adm_ops.c (svn_wc_delete4): Check for conflicts and remove conflict marker files. Rename argument to scratch_pool.