Re: bogus merges

[Russell King <rmk@arm.linux.org.uk>]

On Tue, Sep 06, 2005 at 08:08:57AM -0500, Wayne Scott wrote:
> On 9/5/05, Linus Torvalds <torvalds@osdl.org> wrote:
> > > Really 'git commit' should detect problems like this automatically and
> > > prevent them from getting in the tree.
> > 
> > Well, that would depend on having the fixed git-merge-base in the first
> > place, which in turn would mean that such a commit wouldn't happen at all,
> > so it's kind of circular. It's not worth fixing anywhere else, since once
> > you fix it in git-merge-base, it just becomes a non-issue.
> 
> This just error checking to prevent future bugs from getting committed
> to the tree.  These kinds of things are very hard to repair after the
> fact.

They don't get repaired.

The real problem is that there needs to be a way for cogito to remain
more up to date with git, so that when problems are fixed in git they
can propagate into cogito faster.

I'm not sure separating cogito from git is a good solution though -
I've no real view on how stable the interface between those two bits
are, but I'd hate for a git upgrade to break cogito in some subtle
way.

-- 
Russell King