Re: Problem with tree conflicts caused by a merge

On 04.08.2010 21:42, Daniel Atallah wrote:
> I've created a test case with a brand new test repository (attached)
> that can be used to recreate this issue.
>
> All that needs to be done is to checkout the "A" and "B" branches from
> the testrepos, then try to merge Revisions 7-8 from "B" into "A".
>
> Hopefully that helps track down what the issue is.

Thanks for the test repo.
This is actually a known issue. The svn lib provides an API which should
allow to resolve a tree conflict like this, but it wasn't fully
implemented for all kinds of tree conflicts. Seems this "tried to add,
but was already added locally" is part of that missing implementation.

I'll remove that button for that specific tree conflict.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2643354
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].