Rev 1577: [merge] LockDir integration into new formats in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Mar 9 08:50:51 GMT 2006
------------------------------------------------------------
revno: 1577
revision-id: pqm at pqm.ubuntu.com-20060309085048-37f21fd146dabe93
parent: pqm at pqm.ubuntu.com-20060309063913-6d8ce700706d0802
parent: mbp at sourcefrog.net-20060309075936-c13ae6445966956e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-03-09 08:50:48 +0000
message:
[merge] LockDir integration into new formats
added:
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309075936-c13ae6445966956e
parent: mbp at sourcefrog.net-20060309071410-4ab7d54905541c75
parent: pqm at pqm.ubuntu.com-20060309063913-6d8ce700706d0802
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 18:59:36 +1100
message:
[merge] from bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309071410-4ab7d54905541c75
parent: mbp at sourcefrog.net-20060309051124-024649ca9d9d7326
parent: pqm at pqm.ubuntu.com-20060308164921-68f071c6df0938ab
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 18:14:10 +1100
message:
[merge] from bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309051124-024649ca9d9d7326
parent: mbp at sourcefrog.net-20060309050755-af9d141629defbb0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 16:11:24 +1100
message:
Revert change to WorkingTreeFormat3 format string; too many things want it the old way
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309050755-af9d141629defbb0
parent: mbp at sourcefrog.net-20060309050706-9da444322c067cc4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 16:07:55 +1100
message:
Fix up check on workingtree format 3 format identifier
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309050706-9da444322c067cc4
parent: mbp at sourcefrog.net-20060309035916-f9cde719a97b7487
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 16:07:06 +1100
message:
upgrade to metadir should create LockDirs not files
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309035916-f9cde719a97b7487
parent: mbp at sourcefrog.net-20060309032852-1097eb1947d9bceb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 14:59:16 +1100
message:
New bzr init --format option and test
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309032852-1097eb1947d9bceb
parent: mbp at sourcefrog.net-20060309032845-7d73e11a6b11fbe8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 14:28:52 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309032845-7d73e11a6b11fbe8
parent: mbp at sourcefrog.net-20060309025818-2a026acd76d470fb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 14:28:45 +1100
message:
WorkingTree format identifier string should end in newline so it can be read more easily
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309025818-2a026acd76d470fb
parent: mbp at sourcefrog.net-20060309025503-0cb67e7cf78ba889
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 13:58:18 +1100
message:
Additional WorkingTree LockDir test
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309025503-0cb67e7cf78ba889
parent: mbp at sourcefrog.net-20060309020459-9909376bda89eb6f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 13:55:03 +1100
message:
Convert WorkingTree format3 to use LockDirs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309020459-9909376bda89eb6f
parent: mbp at sourcefrog.net-20060309020151-4035fc90446822e8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 13:04:59 +1100
message:
Additional test that Branch5 uses lockdir properly
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060309020151-4035fc90446822e8
parent: mbp at sourcefrog.net-20060308093027-c1e17961c78b16a5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Thu 2006-03-09 13:01:51 +1100
message:
Clean up test for Branch5 lockdirs
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308093027-c1e17961c78b16a5
parent: mbp at sourcefrog.net-20060308080738-bc96b3fb717e72a6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 20:30:27 +1100
message:
Change branch format 5 to use LockDirs, not transport locks
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308080738-bc96b3fb717e72a6
parent: mbp at sourcefrog.net-20060308075541-c0c015c8d40cad69
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 19:07:38 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308075541-c0c015c8d40cad69
parent: mbp at sourcefrog.net-20060308035330-40065f85adc9652e
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 18:55:41 +1100
message:
BzrDirFormat subclasses can now control what kind of overall lock is used.
meta-1 split out bzr dirs now use a LockDir as the top-level lock
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308035330-40065f85adc9652e
parent: mbp at sourcefrog.net-20060308035210-9536221f6a5bf733
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 14:53:30 +1100
message:
Add new TestCaseWithTransport.assertIsDirectory() and tests
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308035210-9536221f6a5bf733
parent: mbp at sourcefrog.net-20060308032138-a4ef499ad6843ae9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 14:52:10 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308032138-a4ef499ad6843ae9
parent: mbp at sourcefrog.net-20060308032128-a70a3caf64107a09
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 14:21:38 +1100
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060308032128-a70a3caf64107a09
parent: mbp at sourcefrog.net-20060306071109-6b35534e38610c43
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.locks
timestamp: Wed 2006-03-08 14:21:28 +1100
message:
MemoryTransport: Set better permissions on fake directory inodes
More information about the bazaar-commits
mailing list