Re: Best way to merge two repos with same content, different history

From: Robin H. Johnson <robbat2@gentoo.org>
Date: Jun 5, 2009, 18:46 UTC
Message-ID: <robbat2-20090605T183716-227340397Z@orbis-terrarum.net>
In-Reply-To: <63BEA5E623E09F4D92233FB12A9F794303117DC1@emailmn.mqsoftware.com>

On Fri, Jun 05, 2009 at 12:10:30PM -0500, Kelly F. Hickel wrote:

Show 5 quoted lines

> Bost, 
> 	Thanks, but I'm already working with a local copy of the CVS repo.
> 	I've corresponded with Michael Haggerty about the time this takes,
> 	and there just doesn't seem to be any way to improve the speed,
> 	without making some fairly drastic changes to cvs2git.

I've been working with mhagger lately as it also pertains to the Gentoo conversion. We've made some very good progress.

A couple of comments in that regard:
- Make really sure your box is not short of RAM. Throw some measurement
  tools onto there to see it. A couple of GiB is worthwhile. After we
  found this early on, and switched boxes, we dropped from our initial
  multiple days to 20 hours.
- His latest ExternalBlobGenerator code (_NOT_ available in SVN yet)
  reduced our pass1 time from 36204 seconds to 1598 seconds, with
  a potential to be much faster now, as parallelization of part of that
  is now trivial.
- pass9 is still the remaining large time-eater for us. I've started to
  look at it, but I haven't made any actual developments yet.

Would you mind posting your cvs2svn stats like these? http://archives.gentoo.org/gentoo-scm/msg_b69b2f6ecee0ec7bb402d31b372b945b.xml

-- 
Robin Hugh Johnson
Gentoo Linux Developer & Infra Guy
E-Mail     : robbat2@gentoo.org
GnuPG FP   : 11AC BA4F 4778 E3F6 E4ED  F38E B27B 944E 3488 4E85