From: Andreas Schwab <schwab@linux-m68k.org>
To: THILLOSEN Andreas <thillosen@free.fr>
Cc: git@vger.kernel.org
Subject: Re: Git: Having trouble merging two repositories by interweaving their histories
Date: Tue, 10 Sep 2013 01:06:49 +0200 [thread overview]
Message-ID: <87fvtdbnna.fsf@igel.home> (raw)
In-Reply-To: <522E3D12.4090004@free.fr> (THILLOSEN Andreas's message of "Mon, 09 Sep 2013 23:26:42 +0200")
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."
next prev parent reply other threads:[~2013-09-09 23:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-09 21:26 Git: Having trouble merging two repositories by interweaving their histories THILLOSEN Andreas
2013-09-09 23:06 ` Andreas Schwab [this message]
2013-09-10 0:19 ` THILLOSEN Andreas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87fvtdbnna.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=git@vger.kernel.org \
--cc=thillosen@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).