[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: Importing Bzr revisions
From:       Junio C Hamano <gitster () pobox ! com>
Date:       2009-03-23 8:06:20
Message-ID: 7veiwo8xz7.fsf () gitster ! siamese ! dyndns ! org
[Download RAW message or body]

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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]