[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 11 Nov 2008 19:26:33 +0000

On Tue, 2008-11-11 at 18:00 +0000, Julian Foad wrote:
> On Tue, 2008-11-11 at 18:14 +0100, Stephen Butler wrote:
> > Hi tree conflict fans,
> >
> > This patch is almost ready to commit. I just need to fix up about ten
> > tests (for switch et al.).
> >
> > If anyone would like to review it, the changes to check_tree_conflict()
> > and the new function already_in_a_tree_conflict() are probably the most
> > interesting part. Along with the usage of eb->current_tree_conflict.
> Hi Steve. That's fantastic. I struggled with trying to implement
> "skipping", and didn't get this far.
> +1 on the reduction to four essential cases, that you mentioned earlier.
> I'll try to check this over in an hour or two.
> 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.)

- Julian

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-11-11 20:26:53 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.