Unshelving changes with id "1".
bzr: ERROR: exceptions.NotImplementedError: <property object at 0x97b370c>
Traceback (most recent call last):
File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 842, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 1037, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.6/site-packages/bzrlib/commands.py", line 654, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.6/site-packages/bzrlib/builtins.py", line 5699, in run
unshelver.run()
File "/usr/lib/python2.6/site-packages/bzrlib/shelf_ui.py", line 399, in run
merger.do_merge()
File "/usr/lib/python2.6/site-packages/bzrlib/merge.py", line 508, in do_merge
self._do_merge_to(merge)
File "/usr/lib/python2.6/site-packages/bzrlib/merge.py", line 480, in _do_merge_to
merge.do_merge()
File "/usr/lib/python2.6/site-packages/bzrlib/merge.py", line 619, in do_merge
self._compute_transform()
File "/usr/lib/python2.6/site-packages/bzrlib/merge.py", line 674, in _compute_transform
lambda t, c: conflict_pass(t, c, self.other_tree))
File "/usr/lib/python2.6/site-packages/bzrlib/transform.py", line 2633, in resolve_conflicts
new_conflicts.update(pass_func(tt, conflicts))
File "/usr/lib/python2.6/site-packages/bzrlib/merge.py", line 674, in <lambda>
lambda t, c: conflict_pass(t, c, self.other_tree))
File "/usr/lib/python2.6/site-packages/bzrlib/transform.py", line 2709, in conflict_pass
if path_tree.inventory[file_id].parent_id is None:
File "/usr/lib/python2.6/site-packages/bzrlib/transform.py", line 1706, in inventory
raise NotImplementedError(_PreviewTree.inventory)
NotImplementedError: <property object at 0x97b370c>
Same problem here on bzr 2.0.0
Unshelving changes with id "1". NotImplementedE rror: <property object at 0x97b370c>
bzr: ERROR: exceptions.
Traceback (most recent call last): python2. 6/site- packages/ bzrlib/ commands. py", line 842, in exception_ to_return_ code python2. 6/site- packages/ bzrlib/ commands. py", line 1037, in run_bzr python2. 6/site- packages/ bzrlib/ commands. py", line 654, in run_argv_aliases **all_cmd_ args) python2. 6/site- packages/ bzrlib/ builtins. py", line 5699, in run python2. 6/site- packages/ bzrlib/ shelf_ui. py", line 399, in run do_merge( ) python2. 6/site- packages/ bzrlib/ merge.py" , line 508, in do_merge _do_merge_ to(merge) python2. 6/site- packages/ bzrlib/ merge.py" , line 480, in _do_merge_to do_merge( ) python2. 6/site- packages/ bzrlib/ merge.py" , line 619, in do_merge _compute_ transform( ) python2. 6/site- packages/ bzrlib/ merge.py" , line 674, in _compute_transform python2. 6/site- packages/ bzrlib/ transform. py", line 2633, in resolve_conflicts conflicts. update( pass_func( tt, conflicts)) python2. 6/site- packages/ bzrlib/ merge.py" , line 674, in <lambda> python2. 6/site- packages/ bzrlib/ transform. py", line 2709, in conflict_pass inventory[ file_id] .parent_ id is None: python2. 6/site- packages/ bzrlib/ transform. py", line 1706, in inventory rror(_PreviewTr ee.inventory) rror: <property object at 0x97b370c>
File "/usr/lib/
return the_callable(*args, **kwargs)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
unshelver.run()
File "/usr/lib/
merger.
File "/usr/lib/
self.
File "/usr/lib/
merge.
File "/usr/lib/
self.
File "/usr/lib/
lambda t, c: conflict_pass(t, c, self.other_tree))
File "/usr/lib/
new_
File "/usr/lib/
lambda t, c: conflict_pass(t, c, self.other_tree))
File "/usr/lib/
if path_tree.
File "/usr/lib/
raise NotImplementedE
NotImplementedE
bzr 2.0.0 on python 2.6.4 (Linux- 2.6.31- ARCH-i686- Intel-R- _Core-TM- 2_Duo_CPU_ T9500_@ _2.60GHz- with-glibc2. 0) python2. 6/site- packages/ bzrlib/ plugins/ bzrtools [2.0.1] .bazaar/ plugins/ dontcommit [unknown] .bazaar/ plugins/ extmerge [unknown] python2. 6/site- packages/ bzrlib/ plugins/ gtk [0.97.0.final] .bazaar/ plugins/ interactive [1.2.0] python2. 6/site- packages/ bzrlib/ plugins/ launchpad [2.0.0] credential_ store /usr/lib/ python2. 6/site- packages/ bzrlib/ plugins/ netrc_credentia l_store [2.0.0] python2. 6/site- packages/ bzrlib/ plugins/ protect [unknown] .bazaar/ plugins/ rebase [0.5.4dev] .bazaar/ plugins/ rmbr [unknown] .bazaar/ plugins/ scmproj [0.4.5]
arguments: ['/usr/bin/bzr', 'usv']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
bzrtools /usr/lib/
dontcommit /home/phinze/
extmerge /home/phinze/
gtk /usr/lib/
interactive /home/phinze/
launchpad /usr/lib/
netrc_
protect /usr/lib/
rebase /home/phinze/
rmbr /home/phinze/
scmproj /home/phinze/