[jira] [Closed] (SVN-3495) merge breaks on directory that was previously deleted in source and destination

["Stefan Sperling (JIRA)" <ji...@apache.org>]

     [ https://issues.apache.org/jira/browse/SVN-3495?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ]

Stefan Sperling closed SVN-3495.
--------------------------------
       Resolution: Fixed
    Fix Version/s:     (was: unscheduled)
                   1.10.0

Closing this issue as there was no further feedback.

The new conflict resolver in 1.10 should handle this case.
https://subversion.apache.org/docs/release-notes/1.10.html#conflict-resolver

> merge breaks on directory that was previously deleted in source and destination
> -------------------------------------------------------------------------------
>
>                 Key: SVN-3495
>                 URL: https://issues.apache.org/jira/browse/SVN-3495
>             Project: Subversion
>          Issue Type: Bug
>          Components: cmdline client
>    Affects Versions: 1.6.x
>         Environment: Linux
>            Reporter: Paul Hammant
>            Priority: Blocker
>             Fix For: 1.10.0
>
>
> {noformat:nopanel=true}
> 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.
> {noformat}



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)