[MERGE] remove use of deprecated pending_merges

[Aaron Bentley]

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

This bundle replaces two calls to pending_merges with slightly stronger
tests of get_parent_ids, and also updates the documentation of a
function that had been updated earlier.

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

iD8DBQFFEEYe0F+nu1YWqI0RAnQFAJsEYOsHp+nmmD9bopD/7vnNs2wkqwCffhcm
DEw+B21xvXGq0ZOtiF/LIkA=
=kySP
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: no_pending_merges.patch
Type: text/x-patch
Size: 2555 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060919/9d8fd983/attachment.bin