Re: RFD: git-bzr: anyone interested?

From: Chris Packham <judge.packham@gmail.com>
Date: Apr 27, 2010, 00:58 UTC
Message-ID: <k2ga038bef51004261758gb75415aq9abe4564b67c25f3@mail.gmail.com>
In-Reply-To: <m2u86ecb3c71004261646zd17cafdcy85cd2ce522a771d5@mail.gmail.com>

On Mon, Apr 26, 2010 at 4:46 PM, Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> wrote:

Show 10 quoted lines

> 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

Because I searched the git list and thats what I found. Also because I'm familiar with what I want to do using git.

Show 9 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.
>

I'm not really worried about information loss. As long as I can still get at the tags I'm happy. I'm not really planning on keeping this repository after migrating the patches (well may be I'll keep it around to submit the changes but I don't think the upstream project would find them interesting anyway).

Show 19 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.
>

OK heres where I run into problems which I think may be due to openSUSE 11.2s really old version of bzr (1.17). I was missing a 'cd' in my example so I'm not sure if there is an implied one in the bzr example. Either way its barfing on 'bzr checkout -rtag:<tagname> tag-branch' and either refuses to work saying that tag-branch is not a branch or crashes with I omit tag-branch.

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

except the list is subscriber only :( .

Show 5 quoted lines

> 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 ;-)

I'll give it a whirl when I've installed a newer version.

> Thanks. Me will shut up about bzr now =)
>

Yeah me too. I should probably bite the bullet and subscribe or import the old and new tarballs and see what git can do with limited information.