Created
December 18, 2009 19:13
-
-
Save kapilt/259691 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bzr merge ../trunk | |
bzr: ERROR: exceptions.AssertionError: Unknown kind 'absent' | |
Traceback (most recent call last): | |
File "/Users/kapil/software/pytools/lib/python2.5/site-packages/bzr-2.0.2-py2.5-macosx-10.5-i386.egg/bzrlib/commands.py", line 842, in exception_to_return_code | |
return the_callable(*args, **kwargs) | |
File "/Users/kapil/software/pytools/lib/python2.5/site-packages/bzr-2.0.2-py2.5-macosx-10.5-i386.egg/bzrlib/commands.py", line 1037, in run_bzr | |
ret = run(*run_argv) | |
File "/Users/kapil/software/pytools/lib/python2.5/site-packages/bzr-2.0.2-py2.5-macosx-10.5-i386.egg/bzrlib/commands.py", line 654, in run_argv_aliases | |
return self.run(**all_cmd_args) | |
File "/Users/kapil/software/pytools/lib/python2.5/site-packages/bzr-2.0.2-py2.5-macosx-10.5-i386.egg/bzrlib/builtins.py", line 3730, in run | |
verified) | |
File "/Users/kapil/software/pytools/lib/python2.5/site-packages/bzr-2.0.2-py2.5-macosx-10.5-i386.egg/bzrlib/builtins.py", line 3750, in _do_merge | |
conflict_count = merger.do_merge() | |
File "/Users/kapil/software/pytools/lib/python2.5/site-packages/bzr-2.0.2-py2.5-macosx-10.5-i386.egg/bzrlib/merge.py", line 508, in do_merge | |
self._do_merge_to(merge) | |
File "/Users/kapil/software/pytools/lib/python2.5/site-packages/bzr-2.0.2-py2.5-macosx-10.5-i386.egg/bzrlib/merge.py", line 480, in _do_merge_to | |
merge.do_merge() | |
File "/Users/kapil/software/pytools/lib/python2.5/site-packages/bzr-2.0.2-py2.5-macosx-10.5-i386.egg/bzrlib/merge.py", line 620, in do_merge | |
self._compute_transform() | |
File "/Users/kapil/software/pytools/lib/python2.5/site-packages/bzr-2.0.2-py2.5-macosx-10.5-i386.egg/bzrlib/merge.py", line 664, in _compute_transform | |
file_status = self.merge_contents(file_id) | |
File "/Users/kapil/software/pytools/lib/python2.5/site-packages/bzr-2.0.2-py2.5-macosx-10.5-i386.egg/bzrlib/merge.py", line 1166, in merge_contents | |
self.other_tree, file_id) | |
File "/Users/kapil/software/pytools/lib/python2.5/site-packages/bzr-2.0.2-py2.5-macosx-10.5-i386.egg/bzrlib/transform.py", line 2439, in create_from_tree | |
raise AssertionError('Unknown kind %r' % kind) | |
AssertionError: Unknown kind 'absent' |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment