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

Re: tree-conflicts: add-on-add with directories

From: Neels Janosch Hofmeyr <neels_at_elego.de>
Date: Mon, 08 Dec 2008 01:55:12 +0100

Stefan Sperling wrote:
> On Mon, Dec 08, 2008 at 01:16:29AM +0100, Neels Janosch Hofmeyr wrote:
>> Hi tree-conflicts folks,
>>
>> I've just found out that we're not actually raising a tree-conflict upon an
>> added-added conflict involving only a directory. It *is* reported on files
>> when similarly named files are in the two added dirs.
>>
>> See attached reproduction script (which was aiming at testing whether such
>> an add-add conflict on a dir was blocked when stepping into it).
>>
>> ~Neels
>>
>> ------------------------------------------------------
>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=980960
>
> Hey Neels,
>
> The attachment just contained your text again, not the script:

Huh! How's that possible! The mailer must be buggy again.
Trying again.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=980974

Stefan Sperling wrote:
> On Mon, Dec 08, 2008 at 01:16:29AM +0100, Neels Janosch Hofmeyr wrote:
>> Hi tree-conflicts folks,
>>
>> I've just found out that we're not actually raising a tree-conflict upon an
>> added-added conflict involving only a directory. It *is* reported on files
>> when similarly named files are in the two added dirs.
>>
>> See attached reproduction script (which was aiming at testing whether such
>> an add-add conflict on a dir was blocked when stepping into it).
>>
>> ~Neels
>>
>> ------------------------------------------------------
>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=980960
>
> Hey Neels,
>
> The attachment just contained your text again, not the script:

Huh! How's that possible! The mailer must be buggy again.
Trying again.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=980974

Received on 2008-12-08 09:35:22 CET

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