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

merge breaks on directory that was previously deleted in source and destination

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Blocker
    • Resolution: Fixed
    • Affects Version/s: 1.6.x
    • Fix Version/s: 1.10.0
    • Component/s: cmdline client
    • Labels:
      None
    • Environment:

      Linux

      Description

      Assume you have a badDirectory that contains tree conflicts that ordinarily halts a svn merge because 
      of tree conflicts.  
      
      You have the bright idea (born from desperation) that you could kill the badDirectory in source and 
      destination.
      
      But no, it still chokes subversion on the next merge.
      
      Steps to reproduce...
      
      1) svn rm https://svn/repo/trunk/badDirectory -m "kill bad thing"
      2) svn rm https://svn/repo/branches/branch1/badDirectory -m "kill bad thing"
      3) svn co https://svn/repo/branches/branch1
      4) cd branch1
      5) svn merge 1) svn merge https://svn/repo/trunk .
      
                    svn: Attempt to add tree conflict that already exists at 'badDirectory'
                    svn: Error reading spooled REPORT request response
      
      This with a self-built 1.6.x-r38000 from yesterday afternoon.
      I did a search for look-alike issues, but could not see one, hence raising this issue.
      

        Attachments

          Activity

            People

            • Assignee:
              Unassigned
              Reporter:
              paul Paul Hammant
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: