[SVN-3162] use case 5 detection does not check whether victim is obstructed

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.6-consider
• Component/s: libsvn_client
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Stefan Sperling
• Created: 04/Apr/08 14:27
• Updated: 27/Oct/18 16:33
• Resolved: 03/Dec/08 12:45

Description

Quoting Julian Foad in
http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=136849

In the merge_file_deleted() function, case svn_node_file, we've
ensured the file on disk has the same contents as the one we're wanting
to delete.                                                                     
                                                                            

However, we haven't yet determined the WC schedule state of this file.

In order                                                                       
  to be able to delete it without conflict, we require that the
file is versioned                                                              
       and its schedule state is anything except schedule_delete.

Previously, the code was written to not care about tree conflicts.
As long as it ended up with no file present, it didn't care how it
achieved that. (I think previously the "svn_client__wc_delete" silently
did nothing in this case. I haven't verified this.)

Now, in implementing tree conflicts, we do have to care. If there is a 
versioned file, we can delete it. If not, we can't and so we must raise a conflict.

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-3161 Separate obstruction detection from tree conflict detection
• blocks: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
• depends upon: SVN-3163 check svn_client__wc_delete's behaviour wrt tree conflicts
• is blocked by: SVN-3163 check svn_client__wc_delete's behaviour wrt tree 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-3161 Separate obstruction detection from tree conflict detection
• is depended upon by: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts