Hi, You might have noticed a few recent patches on the repository diff editor tweaking the delete support to exactly report what nodes should be deleted.
My current patch for this is attached to this e-mail.
This patch makes the merge code handle every separate delete literally depth
first: all the files/subdirs before the directory.
Without further tweaks to the merge support this appears to cause a few more
tree conflicts than desirable. But I think this support is necessary to
resolve a class of tree conflict issues that wasn't handled before:
verifying if the right tree will be deleted.
I would welcome feedback.
Bert
[[
* subversion/libsvn_client/merge.c
(drive_merge_report_editor): Request walking deleted directories.
* subversion/tests/cmdline/*
Fix expected results.
]]
merge-deleted-handling.patch
Description: Binary data
