Rev 1949: Fix up test_bench_history in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1949
revision-id: pqm at pqm.ubuntu.com-20060822164041-3ff8e0735c0cb7c0
parent: pqm at pqm.ubuntu.com-20060818230844-138315adab4cfe22
parent: abentley at panoramicfeedback.com-20060822163208-731071787c779c37
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-08-22 17:40:41 +0100
message:
  Fix up test_bench_history
modified:
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060822163208-731071787c779c37
    parent: abentley at panoramicfeedback.com-20060822144354-c0dcf3abe6722062
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Tue 2006-08-22 12:32:08 -0400
    message:
      Skip test_bench_history on installed copies of bzr
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060822144354-c0dcf3abe6722062
    parent: abentley at panoramicfeedback.com-20060822143851-99fa08a1a7c667e1
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Tue 2006-08-22 10:43:54 -0400
    message:
      Fix test_bench_history
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060822143851-99fa08a1a7c667e1
    parent: abentley at panoramicfeedback.com-20060728162950-df3fe87f39596c36
    parent: pqm at pqm.ubuntu.com-20060818230844-138315adab4cfe22
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's integration
    timestamp: Tue 2006-08-22 10:38:51 -0400
    message:
      merge bzr.dev