git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Robin H. Johnson <robbat2@gentoo.org>
Date
Jun 5, 2009, 20:02 UTC
Message-ID
<robbat2-20090605T194802-473902673Z@orbis-terrarum.net>
In-Reply-To
<63BEA5E623E09F4D92233FB12A9F794303117DCB@emailmn.mqsoftware.com>
On Fri, Jun 05, 2009 at 02:06:25PM -0500, Kelly F. Hickel wrote:
> Robin, 
> 	That's all good news, I have an 8 way box with 32gb of ram
> running a 64 bit Linux, a box with 4 gb of ram panics during the
> conversion.
Thanks for your data.
For comparison, our conversion box is also 8-way, but only 16GiB RAM.

I'm surprised at how long pass1 is for you, especially since you've got a lot less CVS Files and CVS Revisions than the Gentoo repo (I do deduce that your individual revisions are larger, averaging at 15KiB vs. our 711 bytes).

I think there's something odd in the total CVS branches/tags count however, as the counts there imply an average of 67 branches and 173 tags per CVS revision. You might want to dig into that part manually and see about it (not sure of your Python skills). That would probably cut down both your pass1 and pass4 times significantly.

Hopefully mhagger will get the external blob stuff committed soon, I was working on validating it's results.

In doing so discovered a testcase where RCSRevisionReader and CVSRevisionReader gave different output themselves, the latter (which is documented as more accurate otherwise) missing the contents of an entire file. It's on the cvs2svn-dev mailing list now. Tracing that first, thereafter comparing it to the new Git side.

> git repack -a -d -f --depth=4000 --window=4000 && git pack-refs --all

Did those extreme depth/window values actually help size much? The Gentoo ones actually didn't improve significantly over depth=window=50.

-- 
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
Previous: Kelly F. HickelNext: Kelly F. Hickel
Message 7 of 12 in “Best way to merge two repos with same content, different history”
  1. Kelly F. HickelJun 5, 2009
  2. Rostislav SvobodaJun 5, 2009
  3. Kelly F. HickelJun 5, 2009
  4. Rostislav SvobodaJun 5, 2009
  5. Robin H. JohnsonJun 5, 2009
  6. Kelly F. HickelJun 5, 2009
  7. Robin H. JohnsonJun 5, 2009
  8. Kelly F. HickelJun 5, 2009
  9. Michael HaggertyJun 19, 2009
  10. Avery PennarunJun 5, 2009
  11. Kelly F. HickelJun 5, 2009
  12. Markus HeidelbergJun 5, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.