From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Wed, 18 Jan 2006 20:14:24 GMT
Subject: Re: Cogito wishlist: ability to set merge strategy
Message-ID: <46a038f90601181214m54318d89we505c130e4f397e2@mail.gmail.com>
In-Reply-To: <20060118193201.GV28365@pasky.or.cz>

On 1/19/06, Petr Baudis <pasky@suse.cz> wrote:
> though. From the Git merge strategies, I guess only recursive is
> useful for Cogito...

I haven't had time to figure out where the problem is, I do have some
cases where git-merge does the right thing, and cg-merge gets it
wrong. And without renames.

An example from yesterday:
http://locke.catalyst.net.nz/gitweb?p=moodle.git;a=commit;h=b69d60a5141dfe22a073dd9931e6c8ff5dded0b9

(the repo is accessble via http://locke.catalyst.net.nz/git/moodle.org
if anyone is interested)

> Patches welcome.  ;-)

I know I promised patches in that direction, but I haven't had the
time to look into it. Sorry! (and, as a user, I just cheat and fall
back to git-merge)

cheers,


martin