From: Petr Baudis Date: Sun, 23 Oct 2005 22:39:01 GMT Subject: Re: LCA2006 Git/Cogito tutorial Message-ID: <20051023223901.GW30889@pasky.or.cz> In-Reply-To: <200510231535.j9NFZrmD019309@inti.inf.utfsm.cl> Dear diary, on Sun, Oct 23, 2005 at 05:35:53PM CEST, I got a letter where Horst von Brand told me that... > Petr Baudis wrote: > > [...] > > > Well, it's true that cg-Xmergefile still does not handle all merge > > cases, but it certainly will not be silent about it, at least. ;-) > > The Codeville people seem to have taken a hard > look at merging, but I don't find any clear references to their algorithm. They are working on something much more general, basically abandoning the three-level (RCS-like) merging model altogether and going for the weave (SCCS-like) merging model instead. See also http://revctrl.org/PreciseCodevilleMerge and short crawling around the wiki and external links should give you pretty good idea (see especially SimpleWeaveMerge). -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ VI has two modes: the one in which it beeps and the one in which it doesn't.