[MERGE][#234229] Fix "bzr push --overwrite -r NNN"

[John Arbash Meinel]

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

Andrew Bennetts wrote:
| Oops, I haven't done that for a while.  Really attached this time!
|
| -Andrew
|
| Andrew Bennetts wrote:
|> Andrew Bennetts wrote:
|> [...]
|>> Hah.  I just experienced <https://bugs.launchpad.net/bzr/+bug/234229>:
|>> "bzr push -r NNN --overwrite" is broken at the moment.  The change I proposed
|>> above fixes it.  I'm working on making a proper patch with test at the moment.
|>>
|>> So it's not only simpler, it's less buggy.  I guess I shouldn't be surprised
|>> that these two things go together!
|> The attached patch fixes that bug.  The fix is simple (just delete the cruft),
|> and the test is also straightforward.
|>
|> -Andrew.
|>

This will conflict a little bit with my changes, but it is still correct, and I
like your test case.

BB:approve

John
=:->

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

iEYEARECAAYFAkg2yTIACgkQJdeBCYSNAAM5RwCffeES8l5fmaqq8HakcgU8x1r3
4SgAoJXbcQ16Kd8hQTQvRMnbN83rg8d5
=D7qC
-----END PGP SIGNATURE-----