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

[John Arbash Meinel]

Aaron Bentley wrote:
> 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

By the way +1 to merge this into mainline.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060618/d53d12fc/attachment.pgp