dirstate error (Unknown kind 'absent') on merge/uncommit/merge sequence
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.
Traceback (most recent call last):
conflict_count = merger.do_merge()
file_status = self.merge_
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.
|Changed in bzr:|
|importance:||Undecided → High|
|status:||New → Confirmed|
- Internal error (Unknown kind 'absent') on merge/uncommit/merge sequence
+ dirstate error (Unknown kind 'absent') on merge/uncommit/merge sequence