Traceback (most recent call last):
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 716, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 911, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 547, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.5/site-packages/bzrlib/plugins/qbzr/lib/commands.py", line 632, in run
return bzrlib.builtins.cmd_merge.run(self, *args, **kw)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3443, in run
verified)
File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3461, in _do_merge
conflict_count = merger.do_merge()
File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 493, in do_merge
self._do_merge_to(merge)
File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 465, in _do_merge_to
merge.do_merge()
File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 604, in do_merge
self._compute_transform()
File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 647, in _compute_transform
file_status = self.merge_contents(file_id)
File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 1149, in merge_contents
self.other_tree, file_id)
File "/usr/lib/python2.5/site-packages/bzrlib/transform.py", line 2291, in create_from_tree
raise AssertionError('Unknown kind %r' % kind)
AssertionError: Unknown kind 'absent'
Same here, with 1.13 from ubuntu...
uqbar[dev]> bzr merge ../lp AssertionError: Unknown kind 'absent'
bzr: ERROR: exceptions.
Traceback (most recent call last): python2. 5/site- packages/ bzrlib/ commands. py", line 716, in exception_ to_return_ code python2. 5/site- packages/ bzrlib/ commands. py", line 911, in run_bzr python2. 5/site- packages/ bzrlib/ commands. py", line 547, in run_argv_aliases **all_cmd_ args) python2. 5/site- packages/ bzrlib/ plugins/ qbzr/lib/ commands. py", line 632, in run builtins. cmd_merge. run(self, *args, **kw) python2. 5/site- packages/ bzrlib/ builtins. py", line 3443, in run python2. 5/site- packages/ bzrlib/ builtins. py", line 3461, in _do_merge python2. 5/site- packages/ bzrlib/ merge.py" , line 493, in do_merge _do_merge_ to(merge) python2. 5/site- packages/ bzrlib/ merge.py" , line 465, in _do_merge_to do_merge( ) python2. 5/site- packages/ bzrlib/ merge.py" , line 604, in do_merge _compute_ transform( ) python2. 5/site- packages/ bzrlib/ merge.py" , line 647, in _compute_transform contents( file_id) python2. 5/site- packages/ bzrlib/ merge.py" , line 1149, in merge_contents other_tree, file_id) python2. 5/site- packages/ bzrlib/ transform. py", line 2291, in create_from_tree 'Unknown kind %r' % kind)
File "/usr/lib/
return the_callable(*args, **kwargs)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
return bzrlib.
File "/usr/lib/
verified)
File "/usr/lib/
conflict_count = merger.do_merge()
File "/usr/lib/
self.
File "/usr/lib/
merge.
File "/usr/lib/
self.
File "/usr/lib/
file_status = self.merge_
File "/usr/lib/
self.
File "/usr/lib/
raise AssertionError(
AssertionError: Unknown kind 'absent'
bzr 1.13 on python 2.5.2 (linux2) python2. 5/site- packages/ bzrlib/ plugins/ avahi [0.3dev] python2. 5/site- packages/ bzrlib/ plugins/ builddeb [2.0.2] python2. 5/site- packages/ bzrlib/ plugins/ bzrtools [1.13] python2. 5/site- packages/ bzrlib/ plugins/ dbus [unknown] python2. 5/site- packages/ bzrlib/ plugins/ email [unknown] python2. 5/site- packages/ bzrlib/ plugins/ gtk [0.95.0.final.1] python2. 5/site- packages/ bzrlib/ plugins/ launchpad [unknown] credential_ store /usr/lib/ python2. 5/site- packages/ bzrlib/ plugins/ netrc_credentia l_store [unknown] python2. 5/site- packages/ bzrlib/ plugins/ pqm [1.0dev] python2. 5/site- packages/ bzrlib/ plugins/ qbzr [0.9.8] python2. 5/site- packages/ bzrlib/ plugins/ rebase [0.3] python2. 5/site- packages/ bzrlib/ plugins/ stats [unknown] python2. 5/site- packages/ bzrlib/ plugins/ svn [0.5.3] python2. 5/site- packages/ bzrlib/ plugins/ upload [0.1]
arguments: ['/usr/bin/bzr', 'merge', '../lp']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
avahi /usr/lib/
builddeb /usr/lib/
bzrtools /usr/lib/
dbus /usr/lib/
email /usr/lib/
gtk /usr/lib/
launchpad /usr/lib/
netrc_
pqm /usr/lib/
qbzr /usr/lib/
rebase /usr/lib/
stats /usr/lib/
svn /usr/lib/
upload /usr/lib/