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

Re: Stages of tree conflict detection in "update" [was: branch tree-conflicts-notify: merge to trunk?]

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 30 Oct 2008 12:15:10 +0000

On Tue, 2008-10-28 at 17:59 +0100, Stephen Butler wrote:
> Quoting Julian Foad <julianfoad_at_btopenworld.com>:
>
> >
> > I agree: one notification per conflicted sub-tree. Revised text:
> >
> > [[[
> > * 1. if # Incoming change inside an item already in conflict:
> > * a.
> > * tree/text/prop change to node beneath tree-conflicted dir
> > * then # Skip all changes in this conflicted subtree [2]:
> > * do not update the Base nor the Working
> > * notify "skipped because already in conflict" just once
> > * for the whole conflicted subtree
> > *
> > * if # Incoming change affects an item already in conflict:
> > * b.
> > * tree/text/prop change to tree-conflicted dir/file, or
> > * e.
> > * tree change to a dir tree containing any conflicts, or
> > * c.
> > * tree change to a text/prop-conflicted file/dir, or
> > * d.
> > * text/prop change to a text/prop-conflicted file/dir[1],
> > * then # Skip this change [2]:
> > * do not update the Base nor the Working
> > * notify "skipped because already in conflict"
> > *
> > ]]]
> >
> > I've also added a condition "e." which was missing.
>
> I'm afraid I don't understand condition "e". It sounds rather expensive,
> applying svn_wc_conflicted_p2() to everything in a dir tree. Or did you
> have something else in mind?

I do mean we would have to look for any conflicts on the whole tree that
is to be deleted. (Deletion is the only tree change that this condition
could apply to.) I don't see it as any more expensive than other things
we're doing such as (in a merge) comparing the contents of the subtree
for equality before deleting it.

- 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-10-30 13:15:33 CET

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