BZR status failure

[distler]

  % bzr status

fails with the following error:

  bzr: ERROR: exceptions.KeyError: 'pop(): dictionary is empty'

  Traceback (most recent call last):
    File "/sw/lib/python2.5/site-packages/bzrlib/commands.py", line 846, in run_bzr_catch_errors
      return run_bzr(argv)
    File "/sw/lib/python2.5/site-packages/bzrlib/commands.py", line 797, in run_bzr
      ret = run(*run_argv)
    File "/sw/lib/python2.5/site-packages/bzrlib/commands.py", line 499, in run_argv_aliases
      return self.run(**all_cmd_args)
    File "/sw/lib/python2.5/site-packages/bzrlib/commands.py", line 807, in ignore_pipe
      result = func(*args, **kwargs)
    File "/sw/lib/python2.5/site-packages/bzrlib/builtins.py", line 178, in run
      show_pending=not no_pending)
    File "/sw/lib/python2.5/site-packages/bzrlib/status.py", line 142, in show_tree_status
      show_pending_merges(new, to_file, short)
    File "/sw/lib/python2.5/site-packages/bzrlib/status.py", line 235, in show_pending_merges
      branch.repository.get_parent_map(merge_extra))
    File "/sw/lib/python2.5/site-packages/bzrlib/status.py", line 172, in _get_sorted_revisions
      sorter = tsort.MergeSorter(parent_graph, tip_revision)
    File "/sw/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 (darwin)
  arguments: ['/sw/bin/bzr', 'status']
  encoding: 'US-ASCII', fsenc: 'utf-8', lang: None
  plugins:
    launchpad /sw/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
  *** 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.

This was with

  % bzr --version
  Bazaar (bzr) 1.5
    Python interpreter: /sw/bin/python2.5 2.5.2
    Python standard library: /sw/lib/python2.5
    bzrlib: /sw/lib/python2.5/site-packages/bzrlib
    Bazaar configuration: /Users/distler/.bazaar
    Bazaar log file: /Users/distler/.bzr.log

[James Westby (james-w)]

Hi,

Thanks for the bug report. It appears that this bug
has already been reported.

I believe the fix should be in 1.6, and may already
be in the 1.6 betas that are available if you would
like to get the fix.

Thanks,

James