BZR 1.5 error in status and commit??

[Frits Jalvingh]

I merged two fixes and bazaar now dies on the branch, as follows:
-------------------------------------------------------------------
jal at cite:~/buildfiles/vp-3.1/branch-merge$ bzr status
modified:
  viewpoint/WebContent/empoly/js/ajaxhandler.js
  viewpoint/src/JSprinter/JSprinterPoolServlet.java
pending merges:
  Frits Jalvingh 2008-05-28 Changed some files, made some fixes.
  Frits Jalvingh 2008-05-28 Changed some files, made some fixes.
bzr: ERROR: exceptions.KeyError: 'pop(): dictionary is empty'

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 846, in 
run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 797, in 
run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 499, in 
run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 807, in 
ignore_pipe
    result = func(*args, **kwargs)
  
File "/usr/lib/python2.5/site-packages/bzrlib/plugins/xmloutput/__init__.py", 
line 77, in run
    status_class.run(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 807, in 
ignore_pipe
    result = func(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 178, in run
    show_pending=not no_pending)
  File "/usr/lib/python2.5/site-packages/bzrlib/status.py", line 142, in 
show_tree_status
    show_pending_merges(new, to_file, short)
  File "/usr/lib/python2.5/site-packages/bzrlib/status.py", line 235, in 
show_pending_merges
    branch.repository.get_parent_map(merge_extra))
  File "/usr/lib/python2.5/site-packages/bzrlib/status.py", line 172, in 
_get_sorted_revisions
    sorter = tsort.MergeSorter(parent_graph, tip_revision)
  File "/usr/lib/python2.5/site-packages/bzrlib/tsort.py", line 412, in 
__init__
    parents = self._graph.pop(branch_tip)
KeyError: 'pop(): dictionary is empty'

bzr 1.5 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'status']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
  
bzrtools             /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools 
[1.5.0]
  
launchpad            /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad 
[unknown]
  
xmloutput            /usr/lib/python2.5/site-packages/bzrlib/plugins/xmloutput 
[0.4.2]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.

----------------------------------------------------
The commit does something similar:

----------------------------------------------------

jal at cite:~/buildfiles/vp-3.1/branch-merge$ bzr commit
Committing to: /home/jal/buildfiles/vp-3.1/branch-merge/
modified viewpoint/WebContent/empoly/js/ajaxhandler.js
modified viewpoint/src/JSprinter/JSprinterPoolServlet.java
bzr: ERROR: exceptions.KeyError: 'pop(): dictionary is empty'

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 846, in 
run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 797, in 
run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 499, in 
run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2364, in 
run
    author=author)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in 
write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 240, 
in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/decorators.py", line 165, in 
write_locked
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/mutabletree.py", line 197, in 
commit
    revprops=revprops, *args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/commit.py", line 367, in 
commit
    message = message_callback(self)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2344, in 
get_message
    output_encoding=bzrlib.user_encoding)
  File "/usr/lib/python2.5/site-packages/bzrlib/msgeditor.py", line 259, in 
make_commit_message_template_encoded
    template = make_commit_message_template(working_tree, specific_files)
  File "/usr/lib/python2.5/site-packages/bzrlib/msgeditor.py", line 241, in 
make_commit_message_template
    to_file=status_tmp)
  File "/usr/lib/python2.5/site-packages/bzrlib/status.py", line 142, in 
show_tree_status
    show_pending_merges(new, to_file, short)
  File "/usr/lib/python2.5/site-packages/bzrlib/status.py", line 235, in 
show_pending_merges
    branch.repository.get_parent_map(merge_extra))
  File "/usr/lib/python2.5/site-packages/bzrlib/status.py", line 172, in 
_get_sorted_revisions
    sorter = tsort.MergeSorter(parent_graph, tip_revision)
  File "/usr/lib/python2.5/site-packages/bzrlib/tsort.py", line 412, in 
__init__
    parents = self._graph.pop(branch_tip)
KeyError: 'pop(): dictionary is empty'

bzr 1.5 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'commit']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
  
bzrtools             /usr/lib/python2.5/site-packages/bzrlib/plugins/bzrtools 
[1.5.0]
  
launchpad            /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad 
[unknown]
  
xmloutput            /usr/lib/python2.5/site-packages/bzrlib/plugins/xmloutput 
[0.4.2]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.