Merge on a Git repository

[Ben Finney]

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?

The full error output is:

=====
bzr: ERROR: exceptions.AttributeError: 'LocalGitBranch' object has no attribute '_transport'

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 835, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1030, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 647, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3683, in run
    location, revision, remember, possible_transports, pb)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3788, in _get_merger_from_branch
    _merge_tags_if_possible(other_branch, tree.branch)
  File "/usr/lib/python2.5/site-packages/bzrlib/tag.py", line 255, in _merge_tags_if_possible
    from_branch.tags.merge_to(to_branch.tags)
  File "/usr/lib/python2.5/site-packages/bzrlib/tag.py", line 214, in merge_to
    to_tags._set_tag_dict(result)
  File "/usr/lib/python2.5/site-packages/bzrlib/tag.py", line 160, in _set_tag_dict
    return self.branch._set_tags_bytes(self._serialize_tag_dict(new_dict))
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 699, in _set_tags_bytes
    return _run_with_write_locked_target(self, self._transport.put_bytes,
AttributeError: 'LocalGitBranch' object has no attribute '_transport'

bzr 1.17 on python 2.5.4 (linux2)
arguments: ['/usr/bin/bzr', 'merge', '../lintian.debian/']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_AU.UTF-8'
plugins:
  builddeb             /usr/lib/python2.5/site-packages/bzrlib/plugins/builddeb [0.95dev]
  bzrtools             /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.17]
  dbus                 /usr/lib/python2.5/site-packages/bzrlib/plugins/dbus [0.1dev]
  etckeeper            /usr/lib/python2.5/site-packages/bzrlib/plugins/etckeeper [unknown]
  fastimport           /usr/lib/python2.5/site-packages/bzrlib/plugins/fastimport [0.9dev]
  git                  /usr/lib/python2.5/site-packages/bzrlib/plugins/git [0.4.1]
  gtk                  /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.96.2.final]
  launchpad            /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [1.17]
  loom                 /usr/lib/python2.5/site-packages/bzrlib/plugins/loom [1.4dev]
  netrc_credential_store /usr/lib/python2.5/site-packages/bzrlib/plugins/netrc_credential_store [1.17]
  pqm                  /usr/lib/python2.5/site-packages/bzrlib/plugins/pqm [1.4dev]
  search               /usr/lib/python2.5/site-packages/bzrlib/plugins/search [1.7dev]
  stats                /usr/lib/python2.5/site-packages/bzrlib/plugins/stats [unknown]
  svn                  /usr/lib/python2.5/site-packages/bzrlib/plugins/svn [0.6.3]
  upload               /usr/lib/python2.5/site-packages/bzrlib/plugins/upload [1.0dev]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.
=====

The ‘$HOME/.bzr.log’ entry for this crash is:

=====
Sat 2009-08-08 15:52:09 +1000
0.033  bzr arguments: [u'merge', u'../lintian.debian/']
0.060  looking for plugins in /home/bignose/.bazaar/plugins
0.061  looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
4.375  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 835, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 1030, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 647, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3683, in run
    location, revision, remember, possible_transports, pb)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3788, in _get_merger_from_branch
    _merge_tags_if_possible(other_branch, tree.branch)
  File "/usr/lib/python2.5/site-packages/bzrlib/tag.py", line 255, in _merge_tags_if_possible
    from_branch.tags.merge_to(to_branch.tags)
  File "/usr/lib/python2.5/site-packages/bzrlib/tag.py", line 214, in merge_to
    to_tags._set_tag_dict(result)
  File "/usr/lib/python2.5/site-packages/bzrlib/tag.py", line 160, in _set_tag_dict
    return self.branch._set_tags_bytes(self._serialize_tag_dict(new_dict))
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 699, in _set_tags_bytes
    return _run_with_write_locked_target(self, self._transport.put_bytes,
AttributeError: 'LocalGitBranch' object has no attribute '_transport'

4.388  Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/plugin.py", line 407, in _get__version__
    version_string = _format_version_tuple(version_info)
  File "/usr/lib/python2.5/site-packages/bzrlib/__init__.py", line 90, in _format_version_tuple
    sub = version_info[4]
IndexError: tuple index out of range

4.391  return code 4
=====

-- 
 \      “Earth gets its price for what Earth gives us.” —James Russell |
  `\                                                            Lowell |
_o__)                                                                  |
Ben Finney