Rev 1261: Merge from integration. in /home/robertc/source/baz/storage/

[Robert Collins]

------------------------------------------------------------
revno: 1261
revision-id: robertc at robertcollins.net-20060118013726-2a00175620da6486
parent: robertc at robertcollins.net-20060117220903-5701b15dd567c264
parent: robertc at robertcollins.net-20060118011340-ab7ab3d0ecc47c0f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Wed 2006-01-18 12:37:26 +1100
message:
  Merge from integration.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzr                            bzr.py-20050313053754-5485f144c7006fa6
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060118011340-ab7ab3d0ecc47c0f
    parent: robertc at robertcollins.net-20060117230249-a8cb74e3894b8b3d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2006-01-18 12:13:40 +1100
    message:
      Update SFTP Urls as per mailing list thread.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060117230249-a8cb74e3894b8b3d
    parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
    parent: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2006-01-18 10:02:49 +1100
    message:
      Merge from mbp.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060113074531-d62e6798c2dc5ebc
    parent: mbp at sourcefrog.net-20060113063142-8e706dc1483c69e1
    parent: denys.duchier at mozart-oz.org-20060112160312-2ef168ffc0964c11
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-01-13 18:45:31 +1100
    message:
      [merge] Hold locks around diff to prevent thrashing stat-cache (Denys)
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060112160312-2ef168ffc0964c11
    parent: denys.duchier at mozart-oz.org-20060112140407-8fcdee0baca6d707
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.diff
    timestamp: Thu 2006-01-12 17:03:12 +0100
    message:
      removed the lock_write method for read-only trees
    ------------------------------------------------------------
    merged: denys.duchier at mozart-oz.org-20060112140407-8fcdee0baca6d707
    parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
    committer: Denys Duchier <denys.duchier at mozart-oz.org>
    branch nick: bzr.dev (Main development branch)
    timestamp: Thu 2006-01-12 15:04:07 +0100
    message:
      lock operations for trees - use them for diff
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060113063142-8e706dc1483c69e1
    parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2006-01-13 17:31:42 +1100
    message:
      Bump version to 0.8pre