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

Re: Repeated merge strategies

From: Branko Čibej <brane_at_xbc.nu>
Date: 2002-12-22 15:15:53 CET

Zack Weinberg wrote:

>I *think* it's plausible to do merge arrows, and in fact ancestor
>sets, entirely with revision properties. For MRA functionality, all
>you need is a 'svn:mergedfrom' prop on the merged revision that points
>to the indirect ancestor. AS is a bit trickier; you put a list of
>(merge start, merge end, add/subtract) tuples as properties on the
>merged revision, and walk up the revision graph building the set.

I'd be scared to use properties for this, for two reasons. One is
implementation-specific -- the way we store properties makes them
unsuitable for large amounts of data. The other has to do with
semantics: If you want to stay sane while managing a plethora of
extraneous surplussage of branches, you have to be able to do complex
queries in the merge history. Props simply weren't designed for that.

Come to think of it, that's an implementation-specific reason, too...

Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Dec 22 15:16:34 2002

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