[SVN-3152] Tree conflicts: check that properties match when checking that text matches.

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: all
• Fix Version/s: 1.6.0
• Component/s: libsvn_client
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Julian Foad
• Created: 31/Mar/08 17:33
• Updated: 27/Oct/18 16:34
• Resolved: 10/Mar/09 15:22

Description

In tree conflict detection, operations like rename and delete are allowed
without conflict if the target file exactly matches the "source-left" file. When
checking for "exact match", the file's properties should be checked as well as
its text content. (Probably not the "svn:mergeinfo" property, though?)

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

Issue Links

• blocks: SVN-3210 Merge should raise a tree-conflict when deleting a modified directory (UC5-dirs)
• blocks: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
• is depended upon by: SVN-3210 Merge should raise a tree-conflict when deleting a modified directory (UC5-dirs)
• is depended upon by: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts