Details
-
Bug
-
Status: Closed
-
Major
-
Resolution: Fixed
-
trunk
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.
Attachments
Issue Links
- blocks
-
SVN-3150 merge: tree conflicts with directories as victims
- Closed
-
SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
- Closed
- depends upon
-
SVN-3162 use case 5 detection does not check whether victim is obstructed
- Closed
-
SVN-3152 Tree conflicts: check that properties match when checking that text matches.
- Closed
- is blocked by
-
SVN-3162 use case 5 detection does not check whether victim is obstructed
- Closed
-
SVN-3152 Tree conflicts: check that properties match when checking that text matches.
- Closed
- is depended upon by
-
SVN-3150 merge: tree conflicts with directories as victims
- Closed
-
SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
- Closed