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

[John Arbash Meinel]

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

Alexander Belchenko wrote:

...

> I don't understand this error message. When I run command 'testament' in
> different derived branches I've got this info:
> 
> $ bzr testament -r revid:bialix at ukr.net-20060616045349-a5296e9401d2e6d3
> bazaar-ng testament short form 1
> revision-id: bialix at ukr.net-20060616045349-a5296e9401d2e6d3
> sha1: 3c5b0054a8366f6ce856e17ec39422728dedd161
> 
> Printed sha-1 does not match any number in error message. How I can
> debug this problem? What I need to inspect?
> 
> -- 
> Alexander


Unfortunately, bundles use a different testament. Specifically, they use
a 'StrictTestament' which includes stuff like 'last_modified'. Which
isn't necessary from a "I'm signing this exact revision" standpoint, but
is necessary from an "I'm exactly reproducing what the sender had"
standpoint.

To start with, you are saying that you get the exact same testament hash
for any of the branches, right?

Is it possible for any of us to get a copy of these branches, so that we
can debug it on our side? I realize it may be personal, and that you
don't have a public server to post things.

I could probably receive a private tarball by email, if it stays under
about 10MB.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFEkwGNJdeBCYSNAAMRAnm9AKCdsIho1qT9Wh5bLRlx3xWhFy1OsgCfUlu+
qgaBNFH1bSsSgIw05Meyo40=
=zej/
-----END PGP SIGNATURE-----