[SVN-3210] Merge should raise a tree-conflict when deleting a modified directory (UC5-dirs)

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.8.0
• Component/s: unknown
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Julian Foad
• Created: 29/May/08 12:42
• Updated: 27/Oct/18 16:29
• Resolved: 07/Feb/13 14:20

Description

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.

http://svn.collab.net/repos/svn/branches/tree-conflicts

Issue Links

• blocks: SVN-3150 merge: tree conflicts with directories as victims
• blocks: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
• depends upon: SVN-3162 use case 5 detection does not check whether victim is obstructed
• depends upon: SVN-3152 Tree conflicts: check that properties match when checking that text matches.
• is blocked by: SVN-3162 use case 5 detection does not check whether victim is obstructed
• is blocked by: SVN-3152 Tree conflicts: check that properties match when checking that text matches.
• is depended upon by: SVN-3150 merge: tree conflicts with directories as victims
• is depended upon by: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts