Rev 1817: (mpe) Add cvs/svn aliases 'co' and 'ann' for checkout and annotate, respectively in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1817
revision-id: pqm at pqm.ubuntu.com-20060628130148-518e8b848cbb78c5
parent: pqm at pqm.ubuntu.com-20060627133154-3f28e249ed8815db
parent: john at arbash-meinel.com-20060628125354-65441b98c7383be9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-06-28 14:01:48 +0100
message:
  (mpe) Add cvs/svn aliases 'co' and 'ann' for checkout and annotate, respectively
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060628125354-65441b98c7383be9
    parent: john at arbash-meinel.com-20060628125233-621fa4989b83975b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2006-06-28 07:53:54 -0500
    message:
      NEWS
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060628125233-621fa4989b83975b
    parent: john at arbash-meinel.com-20060627122008-4f1257a91a96cace
    parent: michael at ellerman.id.au-20060628042344-8e61593df0f67f3d
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2006-06-28 07:52:33 -0500
    message:
      [merge] mpe: Add 'co' and 'ann'
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20060628042344-8e61593df0f67f3d
    parent: michael at ellerman.id.au-20060628042009-ff9436dd348abc48
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: mpe
    timestamp: Wed 2006-06-28 14:23:44 +1000
    message:
      Add CVS compatible aliases for checkout and annotate, from fullermd.
    ------------------------------------------------------------
    merged: michael at ellerman.id.au-20060628042009-ff9436dd348abc48
    parent: michael at ellerman.id.au-20060618232130-6723c407d86a957b
    parent: pqm at pqm.ubuntu.com-20060620063849-400861427a3a9ff1
    committer: Michael Ellerman <michael at ellerman.id.au>
    branch nick: mpe
    timestamp: Wed 2006-06-28 14:20:09 +1000
    message:
      Merge trunk.