Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-3162

use case 5 detection does not check whether victim is obstructed

    XMLWordPrintableJSON

Details

    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

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              stsp Stefan Sperling
              Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: