Rev 2016: (jam) don't use deprecated pending_merges for 'bzr update' in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2016
revision-id: pqm at pqm.ubuntu.com-20060916015702-d6561b23f958bfdd
parent: pqm at pqm.ubuntu.com-20060916014706-93f2994bdb0c0850
parent: john at arbash-meinel.com-20060916003152-b2f60431bce0596d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-16 02:57:02 +0100
message:
  (jam) don't use deprecated pending_merges for 'bzr update'
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060916003152-b2f60431bce0596d
    parent: pqm at pqm.ubuntu.com-20060915233942-f1b47109b9823f89
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: update-deprecated
    timestamp: Fri 2006-09-15 19:31:52 -0500
    message:
      Stop using pending_merges() in 'bzr update'