Dear diary, on Sun, Oct 23, 2005 at 05:35:53PM CEST, I got a letter where Horst von Brand <vonbrand@inf.utfsm.cl> told me that... > Petr Baudis <pasky@suse.cz> 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 <http://www.codeville.org> 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. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Mon Oct 24 08:39:36 2005
This archive was generated by hypermail 2.1.8 : 2005-10-24 08:39:40 EST