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

[John Arbash Meinel]

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

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".


However, doing bzr log --show-ids on both sides shows the remote being at:
~ 3408 John Arbash Meinel        2008-04-24
~      revision-id:john at arbash-meinel.com-20080425024812-3libjfzgsypi3l3l
~      change the status code to use find_unique_ancestors()

And the local having:
~ 3408 John Arbash Meinel        2008-04-24
~      revision-id:john at arbash-meinel.com-20080425024812-3libjfzgsypi3l3l
~      change the status code to use find_unique_ancestors()

~ 3409 John Arbash Meinel        2008-04-25
~      revision-id:john at arbash-meinel.com-20080425175727-ll3u7g7qqegvy8us
...

~ 3410 John Arbash Meinel        2008-04-25
~      revision-id:john at arbash-meinel.com-20080425190324-sa68d4ihd5te2pnb
...

~ 3411 John Arbash Meinel        2008-04-25
~      revision-id:john at arbash-meinel.com-20080425203237-c888ix7p0hxza5b3
...

~ 3412 John Arbash Meinel        2008-04-25
~      revision-id:john at arbash-meinel.com-20080425205150-zsytbcx0nol0bilw


(Also, when I try 'bzr merge' it makes a claim about 'nothing to do').

Running with '-Dhpss' I see a huge number of lines like:
19.937  Current RemoteRepository graph hit rate: 0%
...
52.494  Current RemoteRepository graph hit rate: 100%

When I say a lot, I mean there are about 3,400 of them. I see '513' of them for:
52.494  Current RemoteRepository graph hit rate: 99%

Though the timestamp changes slightly.

It has 13 calls to Repository.get_parent_map(), the first 2 stay at 0%, and the
third goes 0->100%,
then 54->100%, 68->100%, 77->100%, 81->100%, 84->100%, 85->100%, 87->95%,
95->95%, 95->100%, 95->100%.

All of them have a "retransmitted 0 of XXXX".

I *was* able to push it to a new branch, with a "Created new branch" message at
the end.

I also know that I pushed this branch earlier, and then did ^C because I had to
go offline before it was finished. I might try to figure something out later,
but it is still reproducible.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkgSoO4ACgkQJdeBCYSNAAPB1QCfYSuZM0t9Ls32/JnOznDQaEAX
s/kAn0CKA1OAVGU8ZseXQG9W+Hamq0zr
=25T5
-----END PGP SIGNATURE-----