Merge on a Git repository

[Ben Finney]

Martin Pool <mbp at canonical.com> writes:

> At a guess this means your bzr-git plugin is out-of-sync with the
> version of Bazaar you're running.

The versions were in the traceback output:

=====
…
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]
…
=====

So, given that output, is it the case that the two are out of sync?

-- 
 \       “Firmness in decision is often merely a form of stupidity. It |
  `\        indicates an inability to think the same thing out twice.” |
_o__)                                                —Henry L. Mencken |
Ben Finney