[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 02:03:58 +0100

Whoa, something's really weird. This last one I sent to the list and myself.
One of the mails *had* the file attached, the other had the message itself
copied into and replacing the attachment.

So did the list get the attachment? I guess not.

I'm pretty sure now that it's not my mailer that is wrong but that some
tigris mailing stuff is not working properly (probably related to the recent

Before I cram this list with sending retries, just get the "attached" file
at: http://hofmeyr.de/svn/cd-into-conflicted3.sh.txt


Neels Janosch Hofmeyr wrote:
> 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 10:41:19 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.