You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Bert Huijben <be...@qqmail.nl> on 2013/01/24 00:26:26 UTC

Enabling full delete reporting for merge

	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.
]]