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

Re: Tree conflict cannot be resolved

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 29 Oct 2009 20:00:04 +0100

On 29.10.2009 16:02, Robert Dailey wrote:
> On Thu, Oct 29, 2009 at 3:21 AM, Lübbe Onken
> <luebbe.tortoisesvn_at_googlemail.com
> <mailto:luebbe.tortoisesvn_at_googlemail.com>> wrote:
>
> Am 28.10.2009 20:21, schrieb Robert Dailey:
> > I'm doing a complex merge from revision 1797 to about 1980 or
> so... it's
> > a lot of changes.
>
> From Napoleon to Ronald Reagan. A lot happened in these 183 years. You
> should integrate more often :)
>
>
> Hah, cute.
>
> However, this still doesn't explain why TortoiseSVN is still breaking.
> When that tree conflict comes in, it says a file was trying to be added
> that was already added. However, regardless of which button I press to
> resolve the tree conflict (i.e. keep local or keep repository) it does
> not change that file. Upon inspection of the file, it is the same one
> that I had added myself. I have to manually browse to the trunk and
> copy/paste over that file to get the changes merged over.

Subversion 1.6.0 did resolve such conflicts properly. But then in (I
think) 1.6.2 that was removed due to some problems and now the API call
simply marks the conflict as resolved.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2412791
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-29 20:00:09 CET

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