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

Re: Tree conflict dialog fails to resolve conflict correctly in merge with added files

From: Stephen Schaub <sschaub_at_gmail.com>
Date: Tue, 6 Jul 2010 15:54:51 -0400

On Tue, Jul 6, 2010 at 3:46 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 06.07.2010 19:26, Stephen Schaub wrote:
>
>> Thank you for the detailed explanation. It makes sense.
>>
>> Shouldn't this behavior be reported as a bug, at least against TSVN,
>> if not also against the svn API? It bit one of my colleagues. The fact
>> that the underlying svn API is not reporting an error does not mean
>> that the behavior should be considered "works as intended" in TSVN.
>
> I did for several tree-conflicting situations already. There also are
> some issues about this open in the svn issue tracker.

Great - thanks for reporting it.

btw I looked in the TSVN issue tracker before I started this thread:

http://code.google.com/p/tortoisesvn/issues/list

Didn't see any issues related to this...

-- 
Stephen Schaub
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2630201
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-07-06 21:56:13 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.