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

Re: tree conflicts

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 3 Sep 2009 07:44:02 -0400

On Thu, Sep 3, 2009 at 7:01 AM, Bolstridge,
Andrew<andy.bolstridge_at_intergraph.com> wrote:
> I have a situation where I think there's a bug in the tree conflict
> detection code. I've tested this (using Tortoise) and have the steps to
> reproduce it.
>
> The bug appears to be around deleted files within a directory, if I have
> 2 directories and delete the same file in each, then try to merge, I get
> a tree conflict error reported on the un-deleted file.
>
> Eg:
> Create 2 directories projA and projB, each contain test1.txt and
> test2.txt. Commit both projects.

Given the direction you go with this test (using merge later),
shouldn't projB be created by copying projA so that they are
ancestrally related?

If you do that does it change the test results at all?

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2390606
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-09-03 14:12:37 CEST

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