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

Re: [PATCH] really skip tree conflict victims (2)

From: Neels J. Hofmeyr <neels_at_elego.de>
Date: Wed, 12 Nov 2008 07:10:25 +0100

Julian Foad wrote:
> On Tue, 2008-11-11 at 18:00 +0000, Julian Foad wrote:
>> n.b. I've also updated the 'tc-resolve' branch so I think it's ready to
>> merge back. I guess you'll want me to wait for this?
> Never mind that comment. The branch is not quite there yet. (It does
> resolve TCs where the target is a victim, but it also resolves TCs where
> the target is the parent, which is not desired.)

Fixed in r34153.
But the new tests for that fail, see my "HEADS UP" mail just before.


Received on 2008-11-12 07:10:46 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.