Rev 2214: ls now takes --show-ids in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2214
revision-id: pqm at pqm.ubuntu.com-20061222171155-51bfebf386004ed0
parent: pqm at pqm.ubuntu.com-20061222013706-0e1cb801c2e0ec9d
parent: abentley at panoramicfeedback.com-20061221212008-xwcgsfwa9jyrkmna
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-12-22 17:11:55 +0000
message:
  ls now takes --show-ids
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20061221212008-xwcgsfwa9jyrkmna
    parent: abentley at panoramicfeedback.com-20061221211145-ammv6t2g18phubcl
    parent: pqm at pqm.ubuntu.com-20061221204334-f206a0f736499cc8
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-12-21 16:20:08 -0500
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20061221211145-ammv6t2g18phubcl
    parent: abentley at panoramicfeedback.com-20061221202052-cisso7ouydlb0mbd
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-12-21 16:11:45 -0500
    message:
      Implement show-ids for all output formats
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20061221202052-cisso7ouydlb0mbd
    parent: abentley at panoramicfeedback.com-20061220221844-95io021dwz80623b
    parent: pqm at pqm.ubuntu.com-20061220185255-86cd0a40a9c2e76e
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-12-21 15:20:52 -0500
    message:
      Merge bzr.dev