On Mar 23, 2009, at 1:27 PM, David Reitter wrote:
On Mar 23, 2009, at 4:06 AM, Junio C Hamano wrote:
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
I'm just experimenting with "bzr fast-export", which converts to
git, and it seems to take about 4 minutes for 1000 revisions on our
(modern) server. That would be around 7 hours for my emacs
repository; I can't do that daily.
I wonder if there's a way for (bzr) fast-export / (git) fast-import
to work incrementally, i.e. for selected or most recent revisions.
Or, one could do something like bzr diff -r $REV.. $BBRANCH | (cd
$GBRANCH; patch -p0; git commit), plus preserving authors and log
messages. Is this roughly what the fast-export format does anyways?
You might want to take a look at git-bzr (http://github.com/pieter/git-bzr/tree/master
) it allows incremental bidirectional interaction between git and bzr
using the fast-export/import, so it might just work in your case.
There are some issues with it, so you might want to check the
'network' part on github and use one of the other variants.
That said, it's a 100 line script that hasn't been used much, so good
luck :)
- Pieter
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
