[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Problem with tree conflicts caused by a merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 05 Aug 2010 20:15:24 +0200

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.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-05 20:15:35 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.