[MERGE] remove use of deprecated pending_merges

[John Arbash Meinel]

Aaron Bentley wrote:
> 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

+1 from me, and it seems reasonable for 0.11 (since it is just changing
a test).

Also, I recently found out about 'python -W error'. Which changes all
warnings into errors. So you can run:

python -W error ./bzr selftest

And it will fail any test that does not catch the deprecation warning.

We might want to consider changing 'make check' to use:

python -W error ./bzr selftest -v $(tests)

The reinvoke stuff inside bzr will cause this to be ignored. So if we
prefer, we could add a command line flag (such as --warnings-as-errors),
though I didn't directly see how you set that internally.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 254 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060919/930814a5/attachment.pgp