[bug] 'bzr update' uses pending_merges()

[Robert Collins]

On Mon, 2006-09-11 at 22:42 -0500, John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> When Robert deprecated 'pending_merges()' he seemed to miss the use by
> 'bzr update'.

Your patch is fine. I missed it because the tests for update dont seem
to trigger the warning - perhaps the blackbox tests are too robust ?

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060912/c6b36775/attachment.pgp