[BUG] Can't commit after merging

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Matthieu Moy wrote:
> 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?

I ran into this kind of thing yesterday.  Grab my latest bzr.ab and run
bzr check.

You're probably haunted by "floating heads*", revisions that are present
in your revision store, for which you lack inventories.  You can remove
the revisions from your revision store.  If you move those revision
files out of your revision-store directory, you should be able to repair
your branch with "fetch-ghosts".

Aaron

*previously called "skeletons"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDfg+b0F+nu1YWqI0RAhB3AJ927+YDM4DI7nFWaBgMfNEVBDSbjACfQYX5
SSdFXS8HFFjyWupSi3Lp/7U=
=BUbA
-----END PGP SIGNATURE-----