From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Thu, 20 Oct 2005 07:04:52 GMT
Subject: Re: cg-merge should use git-merge
Message-ID: <46a038f90510200004l67e2d19kf8e9a4c6190f44f@mail.gmail.com>
In-Reply-To: <46a038f90510190421l50b2c12k495db23b62015782@mail.gmail.com>

On 10/20/05, Martin Langhoff <martin.langhoff@gmail.com> wrote:
> After using git-merge a few times by hand to test-drive the new merge
> drivers, I'm sold on the idea, and I 'd like to have cg-merge use
> git-merge directly.

I started drafting a 5-minute proof-of-concept, and then it struck me:
cg users aren't aware of the index. This is really important when you
are merging and have to resolve a conflict over a dirty tree. git
users know that the "clean" part of the merge is in the index, and
they have to resolve a couple of files in their checkout, and update
the index for those only before calling git-write-tree &
git-commit-tree.

Cogito users don't know about this magic at all, which is a bit of a
problem. I can refuse to run cg-merge on a dirty tree to make things
simpler, but that's cheating ;-)

tagging "for later"...

cheers,


martin