Merge on a Git repository

[Jelmer Vernooij]

Ben Finney wrote:
> Howdy all,
>
> I have two Git repositories: an “upstream” (‘lintian.debian/’), and a
> local clone (‘lintian.devel/’). The upstream repository is at
> <URL:git://git.debian.org/git/lintian/lintian>.
>
> I would like to use Bazaar instead of Git as an interface to these
> repositories. So I have done this:
>
>     $ cd lintian.devel/
>     $ bzr merge ../lintian.debian/
>     bzr: ERROR: exceptions.AttributeError: 'LocalGitBranch' object has no attribute '_transport'
>
> Should I expect this to work? If not, what are the limitations on what I
> can do with a Git repository using Bazaar?
All working tree operations should work. This is a bug fixed in newer
versions of bzr-git.

Cheers,

Jelmer