Rev 1254: Merge from jam-storage. in /home/robertc/source/baz/storage

[Robert Collins]

------------------------------------------------------------
revno: 1254
revision-id: robertc at robertcollins.net-20060105001601-41706f37af6ae182
parent: robertc at robertcollins.net-20060104233504-e812d974dcf90849
parent: john at arbash-meinel.com-20060103212343-7d62a25f4a6e4ac8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: storage
timestamp: Thu 2006-01-05 11:16:01 +1100
message:
  Merge from jam-storage.
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/lockable_files.py       control_files.py-20051111201905-bb88546e799d669f
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/test_branch.py    testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
  bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060103212343-7d62a25f4a6e4ac8
    parent: john at arbash-meinel.com-20060103165510-9218245d08424426
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-storage
    timestamp: Tue 2006-01-03 15:23:43 -0600
    message:
      Changed LockableFiles to take the root directory directly. Moved mode information into LockableFiles instead of Branch
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060103165510-9218245d08424426
    parent: robertc at robertcollins.net-20060103061804-df9a331ca2af48a4
    parent: john at arbash-meinel.com-20060103154418-e6b640e95a1d0e03
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-storage
    timestamp: Tue 2006-01-03 10:55:10 -0600
    message:
      [merge] jam-integration 1495