[MERGE] fix bug #39542 for heavyweight checkouts

[Aaron Bentley]

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

Robert Collins wrote:
> require branch synchronisation to take place. (Robert Collins)
> I'll merge the whole group of branches when this is approved, I think
> all the prerequisites have had +1.

I'll leave the review to John, since he's already reviewed the rest, but
thanks for doing it.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFFBWpj0F+nu1YWqI0RApHvAJ4rEGFNJQy48ylYbsQyIu3Q+Gz4OwCfey+5
QC2w1wzaD7rEDdMAmIKGS3A=
=FDXD
-----END PGP SIGNATURE-----