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

Merge a replacement of a directory

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Fixed
    • 1.5.x
    • ---
    • libsvn_wc
    • None

    Description

      There is a problem demonstrated by merge_tests.py test 33, "merge a replacement
      of a directory". This problem was discussed on the dev list without conclusion
      in the conversation "deleted-with-history [sic] after merge" at
      
        <http://svn.haxx.se/dev/archive-2008-02/0872.shtml>
      
      This problem only shows up now that commit refuses to delete an object that has
      already been deleted in the repository, which was the subject of issue #3156,
      "Delete should conflict with delete (at the repos level)". See that issue for
      further history and comments on this problem.
      

      Attachments

        Issue Links

          Activity

            People

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

              Dates

                Created:
                Updated:
                Resolved: