[BUG] cannot merge bundle if standalone branch was in shared repo

[Aaron Bentley]

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

Alexander Belchenko wrote:

>>> bzr: ERROR: Testament did not match expected value.
>>>        For revision_id {bialix at ukr.net-20060616045349-a5296e9401d2e6d3},
>>> expected {f843ee2b51d9e26cf0fa7c59154bc420749dcdde}, me
>>> asured
>>>        {54b9467567f45b0040adc6b97200aa712f9c4243}
>>>
> 
> I don't understand this error message. When I run command 'testament' in
> different derived branches I've got this info:

Sorry for the confusion.  Bundles use a stricter form of Testament
called a StrictTestament.  In addition to normal info, it also contains
last-modified and the executable bit.

> Printed sha-1 does not match any number in error message. How I can
> debug this problem? What I need to inspect?

Here is a patch for the testament command.  If you run testament
- --strict --long against both copies, and diff the results, you should
see how they differ.

My guess is that these branches have different ghosts.

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

iD8DBQFEkwEv0F+nu1YWqI0RAkgXAJwMPsdVz9ve8Rtczeb1nnZZk6PLhwCggirN
8RAISTi83o6WcWSEAZOPQWg=
=b8KY
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: strict.patch
Type: text/x-patch
Size: 1262 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060616/b9e85762/attachment.bin