bzr pump crashed with exceptions.AttributeError: 'RevisionTree' object has no attribute 'branch'

[Stas Kalashnikov]

Sequence of commands:

Create shared repository, one branch with two files:
$ bzr init-repo pipe-repo
$ cd pipe-repo
$ bzr init trunk
$ cd trunk
$ vim main.e
$ bzr add
$ bzr ci -m "Initial ci"
$ vim Web.config (added one line of text)
$ bzr add
$ bzr ci -m "Config file added"
$ cd ..

Make branch dev and make it a pipeline, add two additional pipes:
$ bzr branch trunk dev
$ cd dev
$ bzr reconfigure-pipeline
$ bzr add-pipe test
$ bzr add-pipe production
$ bzr swp test
$ vim Web.config
$ bzr ci -m "Config changed."
$ bzr swp production
$ vim Web.config
$ bzr ci -m "Config changed."
$ bzr swp dev
$ vim Web.config (change that only line of text)
$ bzr ci -m "Config changed."
$ bzr pump
bzr: ERROR: exceptions.AttributeError: 'RevisionTree' object has no attribute 'branch'

Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 853, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1055, in run_bzr
  File "bzrlib\commands.pyo", line 661, in run_argv_aliases
  File "bzrlib\commands.pyo", line 665, in run_direct
  File "bzrlib\cleanup.pyo", line 122, in run_simple
  File "bzrlib\cleanup.pyo", line 156, in _do_with_cleanups
  File "C:/Program Files/Bazaar/plugins\pipeline\commands.py", line 296, in run
  File "C:/Program Files/Bazaar/plugins\pipeline\pipeline.py", line 737, in pipeline_merge
  File "C:/Program Files/Bazaar/plugins\pipeline\pipeline.py", line 717, in _merge_commit
  File "C:/Program Files/Bazaar/plugins\pipeline\pipeline.py", line 658, in _merge_commit_branch
  File "bzrlib\merge.pyo", line 788, in make_preview_transform
  File "bzrlib\cleanup.pyo", line 122, in run_simple
  File "bzrlib\cleanup.pyo", line 156, in _do_with_cleanups
  File "bzrlib\merge.pyo", line 793, in _make_preview_transform
  File "bzrlib\merge.pyo", line 814, in _compute_transform
  File "bzrlib\merge.pyo", line 1302, in _do_merge_contents
  File "bzrlib\merge.pyo", line 161, in merge_contents
  File "bzrlib\merge.pyo", line 133, in filename_matches_config
AttributeError: 'RevisionTree' object has no attribute 'branch'

bzr 2.1.0 on python 2.5.4 (Windows-XP-5.1.2600-SP3)
arguments: ['bzr', 'pump']
encoding: 'cp1251', fsenc: 'mbcs', lang: 'en'
plugins:
  bzrtools C:\Program Files\Bazaar\plugins\bzrtools [2.1.0]
  explorer C:\Program Files\Bazaar\plugins\explorer [1.0.1]
  launchpad C:\Program Files\Bazaar\plugins\launchpad [2.1.0]
  netrc_credential_store C:\Program Files\Bazaar\plugins\netrc_credential_store [2.1.0]
  news_merge C:\Program Files\Bazaar\plugins\news_merge [2.1.0]
  pipeline C:\Program Files\Bazaar\plugins\pipeline [unknown]
  qbzr C:\Program Files\Bazaar\plugins\qbzr [0.18.3]
  rebase C:\Program Files\Bazaar\plugins\rebase [0.5.5]
  svn C:\Program Files\Bazaar\plugins\svn [1.0.2]
  upload C:\Program Files\Bazaar\plugins\upload [1.0.0dev]
  xmloutput C:\Program Files\Bazaar\plugins\xmloutput [0.8.6]

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

[Andrew Bennetts (spiv)]

This was fixed in bzr 2.1.1. The NEWS entry was:

* Merge correctly when this_tree is not a WorkingTree. (Aaron Bentley)