unable to commit, tree is missing a file id

[Chris Jones]

We have a branch which is used to track log messages and as such, scripts are often committing revisions. I had 12 processes running earlier and clearly two of them managed to collide in some way, because now I have a few dozen uncommitted changes and get the following error:

cmsj@adelie:/srv/admin.canonical.com/log$ bzr commit -m "[cmsj] napalms"
Committing to: /srv/admin.canonical.com/log/
added alchibah
aborting commit write group: NoSuchId(The file id "alpinecurrant-20100427163110-vym81vy2upc48qbi-1" is not present in the tree <bzrlib.inventory.CHKInventory object at 0xa79280c>.)
bzr: ERROR: The file id "alpinecurrant-20100427163110-vym81vy2upc48qbi-1" is not present in the tree <bzrlib.inventory.CHKInventory object at 0xa79280c>.
cmsj@adelie:/srv/admin.canonical.com/log$

At the suggestion of jelmer, I've tried running "bzr rm" on its own and then committing.

The machine in question has bzr 2.1.4 installed, but I have been unable to rescue the branch on a 2.5.0 machine.

[Vincent Ladeuil (vila)]

If this happens again, it would be nice to collect data that would allow us to diagnose what caused this (corrupted fs, bzr locking bug, whatever).

The '.bzr/checkout' and '.bzr/branch' directories and access to a readable repository should do.