Diverged branches failure when pushing packs => knits (using bzr+ssh and bzr.dev)

[John Arbash Meinel]

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

John Arbash Meinel wrote:
> I'm getting a really weird error when pushing from my laptop pack
> repository
> onto my server's knit repository.
> 
> When I do "bzr push" it takes quite a while to think about something,
> and then
> fails with:
> 
> ~  bzr: ERROR: These branches have diverged.  Try using "merge" and then
> "push".
> 
> 

So looking closely at it, it seems that we are sending the revision
texts in the wrong order. I haven't tracked through the code yet, but I
have seen improper ordering of the entries, causing "ghosts" to show up.

I think it meant that when I did ^C during the push, it caused the
revisions to be "half" pushed, so you see the last *two* revisions, but
not the previous ones. So the graph locally looks like:

 A
 |
 B
 |
 C
 |
 D
 |
 E

But on the remote you see

 A

 C <= ghost
 |
 D
 |
 E

And this seems to be why it thinks the graphs have diverged.

In the .kndx itself, I see a lot of stuff like:

E ..... .D
D .... 1242

Which is also evidence that we are transmitting them in the wrong order.

As near as I can tell, inventory.kndx is correct, and in topological
order. So it seems to be a specific bug with our revision transmission.

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

iD8DBQFIE+3nJdeBCYSNAAMRApvmAKC/gqqX+o+7QH9mzM1PhNXhO/zSggCgn7BG
bhIH7BDJZ0lfPGJrNTwe8mE=
=WPKr
-----END PGP SIGNATURE-----