Re: RFD: git-bzr: anyone interested?

From: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
Date: Apr 26, 2010, 23:46 UTC
Message-ID: <m2u86ecb3c71004261646zd17cafdcy85cd2ce522a771d5@mail.gmail.com>
In-Reply-To: <p2ka038bef51004261441x7e4857f1mc3f03a4104f8e018@mail.gmail.com>

On 26 April 2010 22:41, Chris Packham <judge.packham@gmail.com> wrote:

> Hi,
>
> How far did git-bzr or git-remote-bzr get?
>

Don't know, never used.

As far as I know bzr-git can fetch, clone, commit and push to/from bzr/git repos. Not sure why you would want git-bzr

Show 6 quoted lines

> I've tried git-bzr from the repo and I seem to be stumbling on bzr not
> having the fast-export command after I install the fast-import plugin
> as per [1]. So I think its a bazzar problem not a git-bzr one. Has
> anyone got a fully worked example including the installation of the
> required bits and pieces.
>

fast-export would loose information AFAIK use bzr-git with dalwich.

Show 6 quoted lines

> Alternatively what I'm really trying to do is update a series of
> patches for an upstream project that is managed with bazzar. We have
> 30 or so patches with our customizations so I'd like to get git (or
> bzr) to do the heavy lifting for me. In git I'd do something like this
>
> git clone <upstream>

bzr branch <upstream>

> git checkout <tag that corresponds to the version of the tarball we use>

bzr checkout -rtag:<tagname> tag-branch

> git checkout -b our-patches

cd tag-branch

> git am <patches>

bzr patch patch1 patch2 patch2

> git rebase <tag that corresponds to the new version we want to use>

bzr rebase ../<upstream>

> git format-patch ...
>

bzr log -p; or bazaar send -p or create bundle depends on what you want.

> Anybody got a similar recipe for bzr? (yes I'll go ask on the bzr list too)
>

Although I think you really want http://wiki.bazaar.canonical.com/BzrPipeline which helps you import patches ontop of a branch, update upstream, update (merge) patches, and export them again. It's something like quilt, topgit but bzr-styled ;-)

> [1] http://github.com/kfish/git-bzr/blob/master/README

=) hope this helps.

ps. anyone can help with repo.or.cz not reusing objects from parent when pushing to a fork? reported to admin@repo.or.cz they can reproduce the bug but something dodgy is going on. Thanks. Me will shut up about bzr now =)