On Fri, Mar 24, 2006 at 08:52:29AM +0100, Jan-Benedict Glaw wrote: > On Thu, 2006-03-23 19:39:44 -0500, Chris Shoemaker <c.shoemaker@xxxxxxx> wrote: > > On Thu, Mar 23, 2006 at 09:03:06PM +0100, Jan-Benedict Glaw wrote: > > > On Wed, 2006-03-22 17:28:23 -0800, Linus Torvalds <torvalds@xxxxxxxx> wrote: > > > It seems there's a patch like > > > http://www.gelato.unsw.edu.au/archives/git/0602/16278.html is missing? > > > ...or we need a better cvsps. Shall I add it and try again / try to > > > continue, or give up on it for now? Though it would be nice to have > > > these two large and important source trees under GIT control :-) > > > > You make want to try the cvsps patch I attached to the email here: > > > > http://www.gelato.unsw.edu.au/archives/git/0511/11812.html > > [...] > invalid initial_branch for file bfd/po/BLD-POTFILES.in, probably > from old cache, run with -x. I guess that error message wasn't quite as obvious as I intended. That means you have old cvsps cache state hanging around. You can either run cvsps with -x or delete the cache file manually. Those are the files in ~/.cvsps. Incidentally, I'd recommend doing this in two stages during trouble-shooting. Run cvsps first and verify that you can produce a valid ancestry tree. If it's not-quite-right you can even edit the cvsps output to reparent the incorrect branches. Then run git-cvsimport after you're satisfied with the ancestry. -chris - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html