fred@trap:~/src/jhdebuild$ bzr merge
Merging from remembered location svn+ssh://fpeters@svn.gnome.org/svn/jhbuild/trunk
bzr: ERROR: exceptions.AssertionError:
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 802, in run_bzr_catch_errors
return run_bzr(argv)
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 758, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 492, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.4/site-packages/bzrlib/builtins.py", line 2810, in run
conflict_count = merger.do_merge()
File "/usr/lib/python2.4/site-packages/bzrlib/merge.py", line 375, in do_merge
change_reporter=self.change_reporter,
File "/usr/lib/python2.4/site-packages/bzrlib/merge.py", line 487, in __init__
lambda t, c: conflict_pass(t, c, self.other_tree))
File "/usr/lib/python2.4/site-packages/bzrlib/transform.py", line 1703, in resolve_conflicts
new_conflicts.update(pass_func(tt, conflicts))
File "/usr/lib/python2.4/site-packages/bzrlib/merge.py", line 487, in <lambda>
lambda t, c: conflict_pass(t, c, self.other_tree))
File "/usr/lib/python2.4/site-packages/bzrlib/transform.py", line 1760, in conflict_pass
tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
File "/usr/lib/python2.4/site-packages/bzrlib/transform.py", line 438, in version_file
assert file_id is not None
AssertionError
bzr 0.92.0.candidate.1 on python 2.4.4.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'merge']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'fr_BE'
plugins:
bzrss /home/fred/.bazaar/plugins/bzrss [unknown]
bzrtools /usr/lib/python2.4/site-packages/bzrlib/plugins/bzrtools [0.92.0]
launchpad /usr/lib/python2.4/site-packages/bzrlib/plugins/launchpad [unknown]
multiparent /usr/lib/python2.4/site-packages/bzrlib/plugins/multiparent.pyc [unknown]
rebase /usr/lib/python2.4/site-packages/bzrlib/plugins/rebase [0.2.0]
svn /usr/lib/python2.4/site-packages/bzrlib/plugins/svn [0.4.4]
** Please send this report to bazaar@lists.ubuntu.com
with a description of what you were doing when the
error occurred.