Rev 1764: Move doctest import to increase speed in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1764
revision-id: pqm at pqm.ubuntu.com-20060618035337-38acf1cda885d83c
parent: pqm at pqm.ubuntu.com-20060618032246-5be492b564b839d5
parent: aaron.bentley at utoronto.ca-20060618034505-b3ddac81da07b642
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-06-18 04:53:37 +0100
message:
  Move doctest import to increase speed
modified:
  bzrlib/iterablefile.py         iterablefile.py-20051225230610-c93e5550a82115ed
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060618034505-b3ddac81da07b642
    parent: aaron.bentley at utoronto.ca-20060618033950-e793fc83dcb2734b
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sat 2006-06-17 23:45:05 -0400
    message:
      Move doctest import to increase speed
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060618033950-e793fc83dcb2734b
    parent: aaron.bentley at utoronto.ca-20060618033638-46d14ecce0906a7e
    parent: pqm at pqm.ubuntu.com-20060618032246-5be492b564b839d5
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sat 2006-06-17 23:39:50 -0400
    message:
      Merge bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060618033638-46d14ecce0906a7e
    parent: abentley at panoramicfeedback.com-20060615213047-0154a3f7967d750b
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Sat 2006-06-17 23:36:38 -0400
    message:
      Revert --debris/--detritus changes
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060615213047-0154a3f7967d750b
    parent: abentley at panoramicfeedback.com-20060615180328-36042f50f7a41318
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-06-15 17:30:47 -0400
    message:
      Accept classifiers for all tree types, more tests
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060615180328-36042f50f7a41318
    parent: abentley at panoramicfeedback.com-20060615175306-9fb51a0bc2e3aaf5
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-06-15 14:03:28 -0400
    message:
      Rename detritus -> debris, make list_files take a lisf of classifiers
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060615175306-9fb51a0bc2e3aaf5
    parent: aaron.bentley at utoronto.ca-20060607190330-f64d39f4b5122389
    parent: pqm at pqm.ubuntu.com-20060613170241-91efacfc55c6b9d2
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-06-15 13:53:06 -0400
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060607190330-f64d39f4b5122389
    parent: aaron.bentley at utoronto.ca-20060607165526-ddde1b66c1985353
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-06-07 20:03:30 +0100
    message:
      Add support for --detritus to ls