Rev 1842: (jam) allow plugins to include benchmarks in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1842
revision-id: pqm at pqm.ubuntu.com-20060706031529-e189d8c3f42076be
parent: pqm at pqm.ubuntu.com-20060705001902-fdddc760baafe4f5
parent: john at arbash-meinel.com-20060706022726-769792485a0b6890
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-07-06 04:15:29 +0100
message:
  (jam) allow plugins to include benchmarks
modified:
  bzrlib/benchmarks/__init__.py  __init__.py-20060516064526-eb0d37c78e86065d
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060706022726-769792485a0b6890
    parent: john at arbash-meinel.com-20060706022434-247817b84f4a5697
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2006-07-05 21:27:26 -0500
    message:
      Cleanup the imports in bzrlib.benchmark
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060706022434-247817b84f4a5697
    parent: john at arbash-meinel.com-20060706022359-db33eb565c78df96
    parent: john at arbash-meinel.com-20060705170259-ec9c1d916a06cdcb
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2006-07-05 21:24:34 -0500
    message:
      Allow plugins to install have benchmark suites.
        ------------------------------------------------------------
        merged: john at arbash-meinel.com-20060705170259-ec9c1d916a06cdcb
        parent: pqm at pqm.ubuntu.com-20060705001902-fdddc760baafe4f5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: plugin-benchmarks
        timestamp: Wed 2006-07-05 12:02:59 -0500
        message:
          Allow plugins to provide benchmarks just like they do tests
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060706022359-db33eb565c78df96
    parent: john at arbash-meinel.com-20060704144651-22eb63b8cefab365
    parent: pqm at pqm.ubuntu.com-20060705001902-fdddc760baafe4f5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2006-07-05 21:23:59 -0500
    message:
      [merge] bzr.dev 1841