Re: Serf and Tree Conflicts for 1.6

Quoting Bert Huijben <B.Huijben_at_competence.biz>:

> Hi,
>
> Looking at some of the issues reported by the serf buildbot it looks
> like the tree conflict support requires some kind of ordering in the
> received changes that serf does not provide.

> If this issue is really that ordering issue talked about earlier (Can
> somebody confirm this)

Yes, it's the ordering issue discussed by Greg Stein and others on the
list.

> we should discuss how to go forward with:
> A) Relaxing the requirements of the delta editor and fixing the tree
> conflict handling to match the new requirements.

The fix to the tree conflict handling will be straightforward, as long
as it's only restriction 3 that's relaxed. (In the comments in
subversion/include/svn_delta.h).

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