[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 08:15:05 -0400

On Thu, Sep 3, 2009 at 7:44 AM, Mark Phippard<markphip_at_gmail.com> wrote:
> 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?

I created a script that does your recipe but with a normal branch. I
have attached it. It seems to work for me. The output of the final
step when it does the merge is this:

### Merging trunk into branch...
--- Merging r2 through r5 into 'MyProject':
U MyProject/MyFolder/MyFile2.txt
   C MyProject/MyFolder/MyFile1.txt
Summary of conflicts:
  Tree conflicts: 1
### Done.

### Status:

 M 5 5 mphippard MyProject
                 5 5 mphippard MyProject/MyFolder
! C MyProject/MyFolder/MyFile1.txt
> local delete, incoming delete upon merge
M 5 1 mphippard MyProject/MyFolder/MyFile2.txt

Mark Phippard
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-09-03 14:15:41 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.