[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

From: Stefan Sperling <stsp_at_elego.de>
Date: Tue, 11 Nov 2008 00:50:40 +0000

On Tue, Nov 11, 2008 at 01:33:38AM +0100, Stephen Butler wrote:
> Hi tree conflict fans,
> I've been working on the skipping feature for a while now. It's
> been educational, especially when I added tests to update inside
> a tree-conflicted tree.
> Anyway, I have a patch against trunk that is starting to look good.
> Tomorrow I should have it ready to commit. But if anyone
> wants to mess with it, by all means let's set up an experimental
> branch.
> Probably of interest: I got rid of some marginal types of tree
> conflicts, that are of no interest to update/switch. I allow
> only 4 types:
> (edit:deleted)
> (delete:edited)
> (delete:deleted)
> (add:added)

Hey Steve,

Which marginal types of tree conflicts did you get rid of?

And what does "get rid of" mean exactly?

Is the list above the list of conflicts were incoming
modfications to the working copy are not made ("skipped"),
or is it the complete list of conflicts we now detect
during update/switch?

(I tried finding the answer by skimming your patch, but it's
too late at night for it to make any sense to me right now...)


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 01:50:59 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.