Re: [Issue 3210] New - Merge should raise a tree-conflict when deleting a modified item (UC5)
On Thu, May 29, 2008 at 12:42:32PM -0000, julianfoad_at_tigris.org wrote:
> Issue #|3210
> Summary|Merge should raise a tree-conflict when deleting a mod
> |ified item (UC5)
> Status whiteboard|
> Issue type|DEFECT
> Assigned to|issues_at_subversion
> Reported by|julianfoad
> ------- Additional comments from julianfoad_at_tigris.org Thu May 29 05:42:31 -0700 2008 -------
> When "svn merge" attempts to delete a file or dir, if the target item to be
> deleted differs from the merge-left item that was deleted from the source, then
> it should raise a tree conflict. If they are identical, it should just schedule
> the item for delete and not raise a conflict.
> The comparison applies to a file's content and properties, or to a directory's
> children (recursively) and properties.
> This is use case 5 of notes/tree-conflicts/use-cases.txt.
We do this for file contents already, right? (At least I remember
implementing it... :)
I assume this issue is about properties and directories only, and
mentions files only for consistency? Or do we have a bug when handling
Received on 2008-05-29 15:04:34 CEST
- application/pgp-signature attachment: stored
This is an archived mail posted to the Subversion Dev