[BUG] Can't commit after merging

[Aaron Bentley]

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

It appears that fetch is not operating in a safe order.  It is not
ensuring that all the relevant file texts are installed before
installing the inventory.

Empirically, I can show this by taking an uncorrupted branch, and
pulling into it.  I get an error, and then the uncorrupted branch
becomes corrupted.

Apparently, cherrypicking.txt is only one of many affected files.  So
far, the affected revisions are
mbp at sourcefrog.net-20051118081007-80523bf145eb319b
hmeland at twoflower.uio.no-20051006120356-10cd03703265f8c3
hmeland at twoflower.uio.no-20051006225544-bc7ef2300f20d9a3

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDfpHH0F+nu1YWqI0RAoniAJ9VnRGye0IPC/3Ng8TYxAE2DSlQ+ACfYw5L
TRUYzJOyugvIwQ/FoSCGAc4=
=1jAH
-----END PGP SIGNATURE-----