[MERGE] Dirstate blowing up on None as a minikind fingerprint.

[Alexander Belchenko]

Alexander Belchenko has voted comment.
Status is now: Approved
Comment:
I tried to merge this patch and then send merge request to PQM, but I 
can't merge it with bzr.dev. I got error:

E:\Bazaar\mydev\dirstate.None.minikind>python bzr --no-plugins merge
Merging from remembered location E:/Bazaar/mydev/bzr.dev/
bzr: ERROR: exceptions.KeyError: 
'pqm at pqm.ubuntu.com-20070720015347-eaeqmggngaemmbde'

Traceback (most recent call last):
   File "E:\Bazaar\mydev\dirstate.None.minikind\bzrlib\commands.py", line 
729, in run_bzr_catch_errors
     return run_bzr(argv)
   File "E:\Bazaar\mydev\dirstate.None.minikind\bzrlib\commands.py", line 
691, in run_bzr
     ret = run(*run_argv)
   File "E:\Bazaar\mydev\dirstate.None.minikind\bzrlib\commands.py", line 
389, in run_argv_aliases
     return self.run(**all_cmd_args)
   File "E:\Bazaar\mydev\dirstate.None.minikind\bzrlib\builtins.py", line 
2749, in run
     change_reporter=change_reporter)
   File "E:\Bazaar\mydev\dirstate.None.minikind\bzrlib\builtins.py", line 
3946, in _merge_helper
     merger.set_base(base_revision)
   File "E:\Bazaar\mydev\dirstate.None.minikind\bzrlib\merge.py", line 
272, in set_base
     self.find_base()
   File "E:\Bazaar\mydev\dirstate.None.minikind\bzrlib\merge.py", line 
258, in find_base
     self.base_rev_id = graph.find_unique_lca(*revisions)
   File "E:\Bazaar\mydev\dirstate.None.minikind\bzrlib\graph.py", line 
276, in find_unique_lca
     lca = self.find_lca(*revisions)
   File "E:\Bazaar\mydev\dirstate.None.minikind\bzrlib\graph.py", line 
137, in find_lca
     return self._filter_candidate_lca(border_common)
   File "E:\Bazaar\mydev\dirstate.None.minikind\bzrlib\graph.py", line 
241, in _filter_candidate_lca
     del active_searchers[candidate]
KeyError: 'pqm at pqm.ubuntu.com-20070720015347-eaeqmggngaemmbde'

bzr 0.19.0dev0 on python 2.4.4.final.0 (win32)
arguments: ['bzr', '--no-plugins', 'merge']

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C20070721182853.GM31859%40larstiq.dyndns.org%3E