Rev 1954: (spiv) clean up test_bench_history in /home/pqm/archives/thelove/bzr/+trunk/

Thu Aug 24 01:00:06 BST 2006

------------------------------------------------------------
revno: 1954
revision-id: pqm at pqm.ubuntu.com-20060824000004-01ec89ae326683b0
parent: pqm at pqm.ubuntu.com-20060823231659-c39ac4d8e957e878
parent: john at arbash-meinel.com-20060823224238-89bbd75611a4eef9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-08-24 01:00:04 +0100
message:
  (spiv) clean up test_bench_history
modified:
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823224238-89bbd75611a4eef9
    parent: john at arbash-meinel.com-20060823224142-b3701fdfbd6f9adb
    parent: andrew.bennetts at canonical.com-20060823035252-470ec76fa9d07b15
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2006-08-23 17:42:38 -0500
    message:
      [merge] Andrew Bennetts: update test_bench_history
        ------------------------------------------------------------
        merged: andrew.bennetts at canonical.com-20060823035252-470ec76fa9d07b15
        parent: andrew.bennetts at canonical.com-20060823034154-94b7cb9126bade61
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: test tweaks
        timestamp: Wed 2006-08-23 13:52:52 +1000
        message:
          Relax test_assigned_benchmark_file_stores_date's regexp the same way we relaxed test_bench_history's.
        ------------------------------------------------------------
        merged: andrew.bennetts at canonical.com-20060823034154-94b7cb9126bade61
        parent: pqm at pqm.ubuntu.com-20060822222325-10c74ceeec1708fc
        committer: Andrew Bennetts <andrew.bennetts at canonical.com>
        branch nick: test tweaks
        timestamp: Wed 2006-08-23 13:41:54 +1000
        message:
          Make test_bench_history and _get_bzr_source_tree tolerant of UnknownFormatError for the bzr workingtree.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060823224142-b3701fdfbd6f9adb
    parent: john at arbash-meinel.com-20060818162744-d6fafac99f044e76
    parent: pqm at pqm.ubuntu.com-20060823140849-674057caaed0edc0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Wed 2006-08-23 17:41:42 -0500
    message:
      [merge] bzr.dev 1952