From: David Reitter <david.reitter@gmail.com>
Date: Mon, 23 Mar 2009 13:27:24 GMT
Subject: Re: Importing Bzr revisions
Message-ID: <03AC7EDA-2A9F-4626-A67B-CE9F2A88FC7D@gmail.com>
In-Reply-To: <7veiwo8xz7.fsf@gitster.siamese.dyndns.org>

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?