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

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?

Steve

-- 
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org