From: Petr Baudis Date: Wed, 18 Jan 2006 19:32:01 GMT Subject: Re: Cogito wishlist: ability to set merge strategy Message-ID: <20060118193201.GV28365@pasky.or.cz> In-Reply-To: <46a038f90601181006u40a1f8e1n47c27651a4cab3d@mail.gmail.com> Dear diary, on Tue, Jan 17, 2006 at 04:29:49AM CET, I got a letter where "H. Peter Anvin" said that... > It would be nice if Cogito would let one override the default merge > strategy, i.e. to use the recursive merge strategy. I've had some > moderate luck with using recursive merge for the klibc trees recently. Dear diary, on Wed, Jan 18, 2006 at 07:06:07PM CET, I got a letter where Martin Langhoff said that... > One of these days I'll convince Pasky to use git-merge for > cg-merge's internals. For the record, I acknowledge that the merge strategies are useful and I plan to make cg-merge use them, but I'm unable to tell when that will happen. I would still like to keep the current Cogito merging the default merge strategy at least for a while until the dust settles down, though. From the Git merge strategies, I guess only recursive is useful for Cogito... Patches welcome. ;-) -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ Of the 3 great composers Mozart tells us what it's like to be human, Beethoven tells us what it's like to be Beethoven and Bach tells us what it's like to be the universe. -- Douglas Adams