From: Junio C Hamano <gitster@pobox.com>
To: David Reitter <david.reitter@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Importing Bzr revisions
Date: Mon, 23 Mar 2009 01:06:20 -0700 [thread overview]
Message-ID: <7veiwo8xz7.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <90DBD254-1810-4B11-AA9F-C5661A028FA5@gmail.com> (David Reitter's message of "Sun, 22 Mar 2009 23:33:34 -0400")
David Reitter <david.reitter@gmail.com> writes:
> Suppose I have a bzr branch that has been converted (somehow) to a git
> branch, is it then possible to merge new revisions from the bzr branch
> into the git one?
It entirely depends on how that "somehow" goes.
If that "somehow" procedure performs a reliably reproducible conversion
(i.e. not only it will produce the identical git history when you feed the
same bzr history to the procedure twice, but it will produce the identical
git history followed by new history if you feed the bzr history after new
commits are added to the bzr history), you should be able to re-convert
the updated bzr history to git and merge the result with the result of the
earlier conversion. The re-conversion process may not even have to be a
whole re-conversion; it could be incremental. But that is entirely up to
the quality of the conversion "somehow" procedure implements.
next prev parent reply other threads:[~2009-03-23 8:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-23 3:33 Importing Bzr revisions David Reitter
2009-03-23 8:06 ` Junio C Hamano [this message]
2009-03-23 12:13 ` David Reitter
2009-03-23 13:27 ` David Reitter
2009-03-23 13:55 ` Shawn O. Pearce
2009-03-23 14:07 ` Teemu Likonen
2009-03-26 3:05 ` David Reitter
2009-03-23 14:18 ` Pieter de Bie
2009-03-23 15:18 ` David Reitter
2009-03-23 20:15 ` Pieter de Bie
2009-03-23 21:00 ` David Reitter
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=7veiwo8xz7.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=david.reitter@gmail.com \
--cc=git@vger.kernel.org \
/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).