Checkout
Bert Huijben
committed
on 07 Jun 11
Reapply a heavily tweaked version of sbutler's patch that made svn_wc_delete4
clean up conflict marker files of deleted nodes.

Compared to … Show more
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.

Show less