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

Merge should raise a tree-conflict when deleting a modified directory (UC5-dirs)

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • trunk
    • 1.8.0
    • unknown

    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

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              julianfoad Julian Foad
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: