Re: LCA06 Cogito/GIT workshop - (Re: git-whatchanged: exit out early on errors)

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Jan 28, 2006, 05:33 UTC
Message-ID: <46a038f90601272133o53438987ka6b97c21d0cdf921@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0601272345540.2909@evo.osdl.org>

On 1/28/06, Linus Torvalds <torvalds@osdl.org> wrote:

Show 7 quoted lines

> > During the presentation someone mentioned errors when running
> > git-cvsimport which I'm keen on hearing more about.
>
> Martin, I talked to Keith, and apparently you fixed some cvsimport problem
> they had with Cairo during dinner last night? Was that something that
> could have affected other people, or was it very specific to whatever
> Cairo CVS insanity? I've not seen any messages from you on it..

I've got a few small improvements to cvsimport in my laptop that I'll push out for Junio to merge as soon as I get back to the office. I've run "99% successful" imports of cairo and of x.org (modular and monolithic) with all their branches and tags. It isn't literally the 20 years of commits Jim talked initially about -- cvs holds just the last ~5 years.

The repos *are* a bit broken -- files missing (not moved, but really missing) so some of the fixes are to make it easier to discover where it is dying and workaround it. There are a few more things that I need to debug in cvsimport -- there's a small delta between what I should have and what I do have. As soon as they are 100% right I'll put them on http://locke.catalyst.net.nz/gitweb for the X.org team to have a look at them -- and a cronjob to keep them up to date with official CVS.

BTW, have you still got that patch to git-merge to seed the commit msg with conflicted files? ;-)

cheers,