[BUG] Can't commit after merging

[Aaron Bentley]

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

Aaron Bentley wrote:
| Robey Pointer wrote:
|
|>>I got the same thing so I think the flaw is actually present in  bzr.dev
|>>itself.
|
|
| I had this problem with http://bazaar-ng.org/bzr/bzr.dev, which I'd
| recently rsynced.  Is it the same branch for everyone, or different
| branches?

Okay, now I've encountered it again.  The first time was in
inventory.weave.  Now, it's in cherrypicking.py.

I've given Weave a repr, so now I get:

bzrlib.errors.WeaveRevisionNotPresent: Revision
{robertc at robertcollins.net-20050919060519-f582f62146b0b458} not present
in
Weave(u'/home/abentley/bzr.revision-storage/.bzr/weaves/f9/cherry-picking.txt-20050309044946-d14f736fdb588e8f.weave')

My local copies of the cherrypicking.txt weave show just one revision,
but my copy at work has many, including the desired one.

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

iD8DBQFDfn1j0F+nu1YWqI0RAhtsAJ4koLvoQY8K9O7wTi1TJg/XXSlMuwCcC+Zb
K8ICbxE9zg3XBzXUDsRhZw4=
=h6ik
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: cherry-picking.txt-20050309044946-d14f736fdb588e8f.weave
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20051118/d90319bb/attachment.diff 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: cherry-picking.txt-20050309044946-d14f736fdb588e8f.weave
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20051118/d90319bb/attachment-0001.diff