| 2009-09-30 00:53:13 |
Robert Collins |
description |
The noobs trigger all the bugs :-) This happend during my first efforts to use Bazaar...
I have a repository on a remote server and a local branch. I accidentially added a file which should stay out of the repository; I uncommited the unwanted modification, but during the next push, I realized that I had already pushed the operation to the server. Naturally, after a merge, the file reappeared. Since I didn't want it there, I deleted it (with bzr del). After that, the "push" still failed, and a "merge" resulted in the following error:
bzr: ERROR: exceptions.AssertionError: Unknown kind 'absent'
Traceback (most recent call last):
File "//usr/lib/python2.5/site-packages/bzrlib/commands.py", line 896, in run_bzr_catch_errors
return run_bzr(argv)
File "//usr/lib/python2.5/site-packages/bzrlib/commands.py", line 842, in run_bzr
ret = run(*run_argv)
File "//usr/lib/python2.5/site-packages/bzrlib/commands.py", line 542, in run_argv_aliases
return self.run(**all_cmd_args)
File "//usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3335, in run
verified)
File "//usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3353, in _do_merge
conflict_count = merger.do_merge()
File "//usr/lib/python2.5/site-packages/bzrlib/merge.py", line 491, in do_merge
self._do_merge_to(merge)
File "//usr/lib/python2.5/site-packages/bzrlib/merge.py", line 463, in _do_merge_to
merge.do_merge()
File "//usr/lib/python2.5/site-packages/bzrlib/merge.py", line 602, in do_merge
self._compute_transform()
File "//usr/lib/python2.5/site-packages/bzrlib/merge.py", line 645, in _compute_transform
file_status = self.merge_contents(file_id)
File "//usr/lib/python2.5/site-packages/bzrlib/merge.py", line 1147, 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'
bzr 1.12 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'merge', '../a']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.utf8'
plugins:
bzr_difftools /home/sts/.bazaar/plugins/bzr_difftools [unknown]
bzrtools /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools [1.9.1]
dbus /home/sts/.bazaar/plugins/dbus [0.1dev]
gtk /home/sts/.bazaar/plugins/gtk [0.95.0.final.1]
launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
netrc_credential_store /usr/lib/python2.5/site-packages/bzrlib/plugins/netrc_credential_store [unknown]
search /home/sts/.bazaar/plugins/search [1.7dev]
xmloutput /home/sts/.bazaar/plugins/xmloutput [0.8.2]
At first, I have been working with bazaar 1.9; after encountering the bug, I upgraded to 1.12 - the bug still seems to be there.
The encloded shell script reproduces the bug. |
The noobs trigger all the bugs :-) This happend during my first efforts to use Bazaar...
I have a repository on a remote server and a local branch. I accidentially added a file which should stay out of the repository; I uncommited the unwanted modification, but during the next push, I realized that I had already pushed the operation to the server. Naturally, after a merge, the file reappeared. Since I didn't want it there, I deleted it (with bzr del). After that, the "push" still failed, and a "merge" resulted in the following error:
bzr: ERROR: exceptions.AssertionError: Unknown kind 'absent'
Traceback (most recent call last):
File "//usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3335, in run
verified)
File "//usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 3353, in _do_merge
conflict_count = merger.do_merge()
File "//usr/lib/python2.5/site-packages/bzrlib/merge.py", line 491, in do_merge
self._do_merge_to(merge)
File "//usr/lib/python2.5/site-packages/bzrlib/merge.py", line 463, in _do_merge_to
merge.do_merge()
File "//usr/lib/python2.5/site-packages/bzrlib/merge.py", line 602, in do_merge
self._compute_transform()
File "//usr/lib/python2.5/site-packages/bzrlib/merge.py", line 645, in _compute_transform
file_status = self.merge_contents(file_id)
File "//usr/lib/python2.5/site-packages/bzrlib/merge.py", line 1147, 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'
bzr 1.12 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'merge', '../a']
At first, I have been working with bazaar 1.9; after encountering the bug, I upgraded to 1.12 - the bug still seems to be there.
The encloded shell script reproduces the bug. |
|
