Advertising
- Untitled
- Saturday, November 3rd, 2007 at 3:16:13pm UTC
- [email protected]:~/src/jhdebuild$ bzr merge
- Merging from remembered location svn+ssh://[email protected]/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 [email protected]
- with a description of what you were doing when the
- error occurred.
advertising
Update the Post
Either update this post and resubmit it with changes, or make a new post.
You may also comment on this post.
Please note that information posted here will not expire by default. If you do not want it to expire, please set the expiry time above. If it is set to expire, web search engines will not be allowed to index it prior to it expiring. Items that are not marked to expire will be indexable by search engines. Be careful with your passwords. All illegal activities will be reported and any information will be handed over to the authorities, so be good.