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

Re: Git: Having trouble merging two repositories by interweaving their histories

From
Andreas Schwab <schwab@linux-m68k.org>
Date
Sep 9, 2013, 23:06 UTC
Message-ID
<87fvtdbnna.fsf@igel.home>
In-Reply-To
<522E3D12.4090004@free.fr>
THILLOSEN Andreas <thillosen@free.fr> writes:
> It implies "interweaving" their histories, so that I can get a "state"
> of both RepA and RepB around a same time period of time.

This is only possible by rewriting every commit to point to a new tree containing the combined trees of the two repositories. To get a meaningful result this requires that both repositories have a completely linear history.

Andreas.
-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."
Previous: THILLOSEN AndreasNext: THILLOSEN Andreas
Message 2 of 3 in “Git: Having trouble merging two repositories by interweaving their histories”
  1. THILLOSEN AndreasSep 9, 2013
  2. Andreas SchwabSep 9, 2013
  3. THILLOSEN AndreasSep 10, 2013

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.