Rev 1436: Merge Aarons integration branch. in /home/robertc/source/baz/integration

[Robert Collins]

------------------------------------------------------------
revno: 1436
revision-id: robertc at robertcollins.net-20060102225445-8554f5b0109dbc41
parent: robertc at robertcollins.net-20060102223732-d5221b37ff0f7888
parent: aaron.bentley at utoronto.ca-20051226062928-09c4e07bcdfce3af
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-03 09:54:45 +1100
message:
  Merge Aarons integration branch.
modified:
  bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
  bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051226062928-09c4e07bcdfce3af
    parent: aaron.bentley at utoronto.ca-20051226052838-b90834b8788c7101
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Mon 2005-12-26 01:29:28 -0500
    message:
      Fixed hashcache
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051226052838-b90834b8788c7101
    parent: aaron.bentley at utoronto.ca-20051222031427-8479fe2c80b0a5c1
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Mon 2005-12-26 00:28:38 -0500
    message:
      Reactivated hashcache tests
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051222031427-8479fe2c80b0a5c1
    parent: aaron.bentley at utoronto.ca-20051215071914-836bc288d9f55a5b
    parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2005-12-21 22:14:27 -0500
    message:
      Merged Martin's latest
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051215071914-836bc288d9f55a5b
    parent: aaron.bentley at utoronto.ca-20051215065024-658b20fddd26a9ec
    parent: abentley at panoramicfeedback.com-20051214183411-f013b7006e68d0eb
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2005-12-15 02:19:14 -0500
    message:
      Merged in other version of NEWS update
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051215065024-658b20fddd26a9ec
    parent: aaron.bentley at utoronto.ca-20051215064846-aa6cb6c42313c8e3
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2005-12-15 01:50:24 -0500
    message:
      Removed ignore for configure.in, which is never autogenerated.
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20051215064846-aa6cb6c42313c8e3
    parent: abentley at panoramicfeedback.com-20051213201315-8f8f4ab3bc677d35
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2005-12-15 01:48:46 -0500
    message:
      Updated NEWS