[BUG] Can't commit after merging

[Matthieu Moy]

Hi,

I had an unmodified branch of bzr.dev, I commited a few manual
changes, and merged the ftp transport from Daniel Silverstone. Then, I
merged from mainline, and once more from Daniel.

Now, I can merge from mainline, but not commit anymore:

$ bzr status
modified:
  NEWS
  bzrlib/annotate.py
  bzrlib/builtins.py
  bzrlib/commands.py
  bzrlib/commit.py
  bzrlib/config.py
  bzrlib/errors.py
  bzrlib/selftest/testannotate.py
  bzrlib/selftest/testconfig.py
  bzrlib/selftest/testlog.py
  bzrlib/tree.py
pending merges:
  Martin Pool 2005-11-18 [merge] fix \t in commit messages
    Martin Pool 2005-11-18 Make annotate cope better with revisions committe...
    Martin Pool 2005-11-18 [merge] jaq
    Jamie Wilkinson 2005-11-18 add some examples to the documentation for Co...
    Jamie Wilkinson 2005-11-18 partial merge from Martin, fixed conflicts wi...
    Jamie Wilkinson 2005-11-18 Fix a typo and grammar in Config.username() d...
    Jamie Wilkinson 2005-11-14 Exclude '.bzrignore' from exports. 
    Martin Pool 2005-11-17 [merge] ftp transport, renamed-modified
    Martin Pool 2005-11-17 [merge] aaron
    Aaron Bentley 2005-11-16 Merged the mainline
    Aaron Bentley 2005-11-15 Fixed handling of files in mixed branches
    Harald Meland 2005-10-07 Cleanup + better test of commit-msg control cha...
    Harald Meland 2005-10-06 Fixed typo that could cause TABs in commit mess...
$ bzr commit -m merge
bzr: ERROR: Revision {robertc at robertcollins.net-20050919060519-f582f62146b0b458} not present in <bzrlib.weave.Weave object at 0xb76c47ac>

If I revert, redo the merge, retry to commit, the bug is still there.
~/.bzr.log just says:

[16847] Fri 18:02:59.651 ERROR: Revision {robertc at robertcollins.net-20050919060519-f582f62146b0b458} not present in <bzrlib.weave.Weave object at 0xb761a7ac>

Can I do something to help debugging this?

-- 
Matthieu