Re: RFD: git-bzr: anyone interested?

From: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>
Date: Apr 27, 2010, 08:47 UTC
Message-ID: <q2j86ecb3c71004270147le799967dw579964600be84066@mail.gmail.com>
In-Reply-To: <4BD651C6.5050501@gmail.com>

On 27 April 2010 03:53, Gabriel Filion <lelutin@gmail.com> wrote:

Show 17 quoted lines

> Hello,
>
> On 2010-04-26 17:41, Chris Packham wrote:
>> How far did git-bzr or git-remote-bzr get?
>>
>
> I unfortunately haven't had much time to fiddle with this. Having a full
> time job doesn't give me much space for experiences :( And on my free
> time, I've been a bit busy with one of my projects..
>
>
> I've tried simply "plugging in" the bzr-fastimport plugin to do the
> communication part. They already implement output similar to what
> git-fastimport expects. I was stuck on the part where you have to
> specify "marks" files, and about where to place them, so I left it there
> for now.
>

Except that bzr-fast-export -> bzr-fast-import will produce similar history but all revision ids will be different so you will not be able to merge in bzr after you worked in git =/ so it will be read-only. Marks files are used when you want to import multiple related bzr branches into a git repo. So in general case you will not need it =)

Show 18 quoted lines

> I'll try and work on this pretty soon, but since I'm doing this on spare
> time, any help would be welcome. Maybe the good thing to do would be to
> put up a page somewhere with a mini-roadmap and the info needed/the info
> that was found out?
> By using bzr fast-import, the whole thing shouldn't take too long.
>
>> 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].
>
>> [1] http://github.com/kfish/git-bzr/blob/master/README
>
> This script needs you to install bazaar and the bzr "fast-import"
> plugin. Normally the fast-export command is implemented by it. You need
> a rather up-to-date version, though.
> I've found this script to work mostly for pulling in changes from bzr
> into git. Pushing has proven to be from slow to non-functional.
>

Well I did this:

$ mkdir -p ~/.bazaar/plugins $ bzr branch lp:bzr-fast-import ~/.bazaar/fast-import $ bzr branch lp:xiphos $ git init git-xiphos $ cd git-xiphos $ bzr fast-export ../xiphos | git fast-import

And the resulting git repository has master branch with tags.

Show 7 quoted lines

>
> As for the interest in this: mine is in using only one tool to do the
> work right and not having to switch from using 3 vcs tools (the current
> situation at work is 2 -- git and svn -- but soon bzr will come in). And
> for the one tool, I'd like to choose git.
> stupid reason? probably. but I've tried bzr and I don't like it.
>

Well I have my stupid reasons as well for choosing bzr for small projects. With bzr-hg, bzr-git & bzr-svn I can work on all 4 without doing a context switch. When I work on something big though like gcc or binutils. Yeah git.... because of size & performance.

With bzr-* plugins though you generally get roundtrip & svn support is excellent. On two machines bzr branch svn://URL will give identical branches which you can merge between in bzr & svn, unlike git where you have to use canonical import to have same SHA-1's on commits.

Show 7 quoted lines

> --
> Gabriel Filion
> --
> 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
>