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

Re: Tree conflict detection in 'svn merge'

From: Stephen Butler <sbutler_at_elego.de>
Date: Fri, 22 Feb 2008 15:55:57 +0100

Quoting Julian Foad <julianfoad_at_btopenworld.com>:
> I am having difficulty understanding your proposal in detail because it
> is written in terms of the fields of merge_cmd_baton_t, but without
> saying exactly where and when you mean to apply these rules. Could you
> try to write it primarily in terms of universal truth concepts, like
>
> "If it is possible to determine a common ancestor, then ..."
>
> instead of
>
> "If the 'is_ancestor' field is true, then ...".
>
> That would help me a lot.

Hi Julian,

I'm rewriting the design proposal for clarity (separating the
implementation details from the rationale, for starters). I'll also
update the parts we've already discussed.

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
Received on 2008-02-22 15:56:08 CET

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