[MERGE] really get push working with less lock churn

[Robert Collins]

This is a rollup, same commentary as the prior patch - but some lock
tests didn't like the new behaviour, which I think is superior - so I
changed them.

-Rob
-------------- next part --------------
A non-text attachment was scrubbed...
Name: push-roundtrips-4299.patch
Type: text/x-patch
Size: 28702 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090415/fd957412/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090415/fd957412/attachment-0001.pgp