Rev 2407: (broken) merge aaron's workingtree format changes in http://sourcefrog.net/bzr/dirstate
Martin Pool
mbp at sourcefrog.net
Mon Feb 26 02:56:27 GMT 2007
At http://sourcefrog.net/bzr/dirstate
------------------------------------------------------------
revno: 2407
revision-id: mbp at sourcefrog.net-20070226025624-4cfvc1r2it0oxxt2
parent: robertc at robertcollins.net-20070226013238-w7sjnnn1d7uvcpg5
parent: aaron.bentley at utoronto.ca-20070225153342-1ezvd6nf72f7na8k
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: dirstate
timestamp: Mon 2007-02-26 13:56:24 +1100
message:
(broken) merge aaron's workingtree format changes
added:
bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
bzrlib/tests/test_extract.py test_extract.py-20061002214140-qdnnm67q1ov6x6pd-1
bzrlib/tests/test_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-1
bzrlib/tests/workingtree_implementations/test_add_reference.py test_add_reference.p-20061211024451-yo9i1691dgbv1eyn-1
bzrlib/xml7.py xml7.py-20061029182747-d5tiiny21bvrd2jj-1
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
------------------------------------------------------------
revno: 2359.1.9
merged: aaron.bentley at utoronto.ca-20070225153342-1ezvd6nf72f7na8k
parent: aaron.bentley at utoronto.ca-20070225151516-38bls2quulk8xsu5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Sun 2007-02-25 10:33:42 -0500
message:
Fix test locking for dirstate
------------------------------------------------------------
revno: 2359.1.8
merged: aaron.bentley at utoronto.ca-20070225151516-38bls2quulk8xsu5
parent: aaron.bentley at utoronto.ca-20070224161132-ymdyp4vnbab7ewfe
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Sun 2007-02-25 10:15:16 -0500
message:
Merge refactoring of add_reference
------------------------------------------------------------
revno: 2359.1.7
merged: aaron.bentley at utoronto.ca-20070224161132-ymdyp4vnbab7ewfe
parent: aaron.bentley at utoronto.ca-20070224153100-2wjayj3uwtges1u2
parent: john at arbash-meinel.com-20070223225101-92gi3mujiugb0tk0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Sat 2007-02-24 11:11:32 -0500
message:
Merge from dirstate
------------------------------------------------------------
revno: 2359.1.6
merged: aaron.bentley at utoronto.ca-20070224153100-2wjayj3uwtges1u2
parent: aaron.bentley at utoronto.ca-20070223054754-v9b1sjlwti19kzq3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Sat 2007-02-24 10:31:00 -0500
message:
Fix update to set unique roots, and work with dirstate
------------------------------------------------------------
revno: 2359.1.5
merged: aaron.bentley at utoronto.ca-20070223054754-v9b1sjlwti19kzq3
parent: aaron.bentley at utoronto.ca-20070223054726-298pl3o2u3d7lsy1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Fri 2007-02-23 00:47:54 -0500
message:
fix revision_tree tests
------------------------------------------------------------
revno: 2359.1.4
merged: aaron.bentley at utoronto.ca-20070223054726-298pl3o2u3d7lsy1
parent: aaron.bentley at utoronto.ca-20070223044530-2ggdpsjtboqeosi5
parent: john at arbash-meinel.com-20070223030108-da1z3sofjti2xulz
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Fri 2007-02-23 00:47:26 -0500
message:
merge from dirstate
------------------------------------------------------------
revno: 2359.1.3
merged: aaron.bentley at utoronto.ca-20070223044530-2ggdpsjtboqeosi5
parent: aaron.bentley at utoronto.ca-20070223042529-jf4altbwxy26y965
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Thu 2007-02-22 23:45:30 -0500
message:
tweak tests
------------------------------------------------------------
revno: 2359.1.2
merged: aaron.bentley at utoronto.ca-20070223042529-jf4altbwxy26y965
parent: aaron.bentley at utoronto.ca-20070222055157-27illmnxqr1s6rkj
parent: robertc at robertcollins.net-20070222060839-tv56d0biir2ipav1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Thu 2007-02-22 23:25:29 -0500
message:
Merge fix from mainline
------------------------------------------------------------
revno: 2359.1.1
merged: aaron.bentley at utoronto.ca-20070222055157-27illmnxqr1s6rkj
parent: robertc at robertcollins.net-20070222050658-m9gdlj1ypv2gqvjx
parent: aaron.bentley at utoronto.ca-20070221060606-unjaailciijp12ab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: dirstate
timestamp: Thu 2007-02-22 00:51:57 -0500
message:
Merge from by-reference-trees
------------------------------------------------------------
revno: 2100.3.37
merged: aaron.bentley at utoronto.ca-20070221060606-unjaailciijp12ab
parent: aaron.bentley at utoronto.ca-20070221054318-aq9ka6dgoo42ht8c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-02-21 01:06:06 -0500
message:
rename working tree format 4 to AB1 everywhere
------------------------------------------------------------
revno: 2100.3.36
merged: aaron.bentley at utoronto.ca-20070221054318-aq9ka6dgoo42ht8c
parent: aaron.bentley at utoronto.ca-20070221051255-487kfuufebg675ac
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-02-21 00:43:18 -0500
message:
avoid subtree commit when converting a work tree into a revision tree
------------------------------------------------------------
revno: 2100.3.35
merged: aaron.bentley at utoronto.ca-20070221051255-487kfuufebg675ac
parent: aaron.bentley at utoronto.ca-20070217211119-ggocr9ne4ua1udac
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-02-21 00:12:55 -0500
message:
equality operations on bzrdir
------------------------------------------------------------
revno: 2100.3.34
merged: aaron.bentley at utoronto.ca-20070217211119-ggocr9ne4ua1udac
parent: aaron.bentley at utoronto.ca-20070217202142-58mh87yi27etx8o0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-02-17 16:11:19 -0500
message:
Fix BzrDir.cloning_metadir with no format
------------------------------------------------------------
revno: 2100.3.33
merged: aaron.bentley at utoronto.ca-20070217202142-58mh87yi27etx8o0
parent: aaron.bentley at utoronto.ca-20070217201404-52tyj7fg32n0rv0h
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-02-17 15:21:42 -0500
message:
Handle unique roots in tests for TreeTransform.iter_changes
------------------------------------------------------------
revno: 2100.3.32
merged: aaron.bentley at utoronto.ca-20070217201404-52tyj7fg32n0rv0h
parent: aaron.bentley at utoronto.ca-20070216070219-b22k0gwnisnxawnk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-02-17 15:14:04 -0500
message:
fix tree format, basis_tree call, in sprout
------------------------------------------------------------
revno: 2100.3.31
merged: aaron.bentley at utoronto.ca-20070216070219-b22k0gwnisnxawnk
parent: aaron.bentley at utoronto.ca-20070209071620-gp2n7vtjyb0f2x1e
parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Fri 2007-02-16 02:02:19 -0500
message:
Merged bzr.dev (17 tests failing)
------------------------------------------------------------
revno: 2100.3.30
merged: aaron.bentley at utoronto.ca-20070209071620-gp2n7vtjyb0f2x1e
parent: aaron.bentley at utoronto.ca-20070209071255-74pex0pbd0gelb1u
parent: pqm at pqm.ubuntu.com-20070207230659-d4b568ed7b4cec4e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Fri 2007-02-09 02:16:20 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2100.3.29
merged: aaron.bentley at utoronto.ca-20070209071255-74pex0pbd0gelb1u
parent: aaron.bentley at utoronto.ca-20070127233908-uon1klmy81mo1yfx
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Fri 2007-02-09 02:12:55 -0500
message:
Get merge working initially
------------------------------------------------------------
revno: 2100.3.28
merged: aaron.bentley at utoronto.ca-20070127233908-uon1klmy81mo1yfx
parent: aaron.bentley at utoronto.ca-20070127201700-zpa95eucj24u8pyp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-01-27 18:39:08 -0500
message:
Make sprout recursive
------------------------------------------------------------
revno: 2100.3.27
merged: aaron.bentley at utoronto.ca-20070127201700-zpa95eucj24u8pyp
parent: aaron.bentley at utoronto.ca-20070127182827-4b8dg34lxi8ipuwe
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-01-27 15:17:00 -0500
message:
Enable nested commits
------------------------------------------------------------
revno: 2100.3.26
merged: aaron.bentley at utoronto.ca-20070127182827-4b8dg34lxi8ipuwe
parent: aaron.bentley at utoronto.ca-20070127170241-669zhj1p5d28wgu2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-01-27 13:28:27 -0500
message:
checkout type is maintained for subtrees
------------------------------------------------------------
revno: 2100.3.25
merged: aaron.bentley at utoronto.ca-20070127170241-669zhj1p5d28wgu2
parent: aaron.bentley at utoronto.ca-20070126053435-23q8s18dsystsh8b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sat 2007-01-27 12:02:41 -0500
message:
add subsubtree to test
------------------------------------------------------------
revno: 2100.3.24
merged: aaron.bentley at utoronto.ca-20070126053435-23q8s18dsystsh8b
parent: aaron.bentley at utoronto.ca-20070126041844-0sb1f2eq7ovqe63j
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Fri 2007-01-26 00:34:35 -0500
message:
Get all tests passing again
------------------------------------------------------------
revno: 2100.3.23
merged: aaron.bentley at utoronto.ca-20070126041844-0sb1f2eq7ovqe63j
parent: aaron.bentley at utoronto.ca-20070126040012-j80k7qhvj80dyp9j
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2007-01-25 23:18:44 -0500
message:
Nested checkouts kinda work
------------------------------------------------------------
revno: 2100.3.22
merged: aaron.bentley at utoronto.ca-20070126040012-j80k7qhvj80dyp9j
parent: aaron.bentley at utoronto.ca-20070115131020-wr397y8izr6i2epm
parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2007-01-25 23:00:12 -0500
message:
merge from bzr.dev
------------------------------------------------------------
revno: 2100.3.21
merged: aaron.bentley at utoronto.ca-20070115131020-wr397y8izr6i2epm
parent: aaron.bentley at utoronto.ca-20070112044818-nnw6iunriqq073qc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Mon 2007-01-15 08:10:20 -0500
message:
Work on checking out by-reference trees
------------------------------------------------------------
revno: 2100.3.20
merged: aaron.bentley at utoronto.ca-20070112044818-nnw6iunriqq073qc
parent: aaron.bentley at utoronto.ca-20070111051628-zm6q793yyxhewifj
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2007-01-11 23:48:18 -0500
message:
Implement tree comparison for tree references
------------------------------------------------------------
revno: 2100.3.19
merged: aaron.bentley at utoronto.ca-20070111051628-zm6q793yyxhewifj
parent: aaron.bentley at utoronto.ca-20070111044206-dav6kgz24cd08ec0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2007-01-11 00:16:28 -0500
message:
Ensure commit preserves reference revision
------------------------------------------------------------
revno: 2100.3.18
merged: aaron.bentley at utoronto.ca-20070111044206-dav6kgz24cd08ec0
parent: aaron.bentley at utoronto.ca-20070111034653-wa1n3uy49wbvom5m
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-01-10 23:42:06 -0500
message:
Get commit working for tree references
------------------------------------------------------------
revno: 2100.3.17
merged: aaron.bentley at utoronto.ca-20070111034653-wa1n3uy49wbvom5m
parent: aaron.bentley at utoronto.ca-20070111031041-cu4tmhma4sqjph48
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-01-10 22:46:53 -0500
message:
Remove get_format_*, make FormatRegistry.register_metadir vary working tree
------------------------------------------------------------
revno: 2100.3.16
merged: aaron.bentley at utoronto.ca-20070111031041-cu4tmhma4sqjph48
parent: aaron.bentley at utoronto.ca-20061222051434-mv7zhuh0wp8hhfi8
parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Wed 2007-01-10 22:10:41 -0500
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2100.3.15
merged: aaron.bentley at utoronto.ca-20061222051434-mv7zhuh0wp8hhfi8
parent: aaron.bentley at utoronto.ca-20061222032850-nfiemdjr81urpbm3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Fri 2006-12-22 00:14:34 -0500
message:
get test suite passing
------------------------------------------------------------
revno: 2100.3.14
merged: aaron.bentley at utoronto.ca-20061222032850-nfiemdjr81urpbm3
parent: aaron.bentley at utoronto.ca-20061222020006-8h1kgh4iax3c90ju
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2006-12-21 22:28:50 -0500
message:
Test workingtree4 format, prevent use with old repos
------------------------------------------------------------
revno: 2100.3.13
merged: aaron.bentley at utoronto.ca-20061222020006-8h1kgh4iax3c90ju
parent: aaron.bentley at utoronto.ca-20061211233228-wh8chcfx949px2c2
parent: pqm at pqm.ubuntu.com-20061221204334-f206a0f736499cc8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Thu 2006-12-21 21:00:06 -0500
message:
merge bzr.dev
------------------------------------------------------------
revno: 2100.3.12
merged: aaron.bentley at utoronto.ca-20061211233228-wh8chcfx949px2c2
parent: aaron.bentley at utoronto.ca-20061211054923-fd8abzfza1g86zn7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Mon 2006-12-11 18:32:28 -0500
message:
Stop generating unique roots for WorkingTree3
------------------------------------------------------------
revno: 2100.3.11
merged: aaron.bentley at utoronto.ca-20061211054923-fd8abzfza1g86zn7
parent: aaron.bentley at utoronto.ca-20061211052748-672fjh70mzze3qkh
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Mon 2006-12-11 00:49:23 -0500
message:
Add join --reference support
------------------------------------------------------------
revno: 2100.3.10
merged: aaron.bentley at utoronto.ca-20061211052748-672fjh70mzze3qkh
parent: aaron.bentley at utoronto.ca-20061211033630-96rvmkj06ed66n27
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Mon 2006-12-11 00:27:48 -0500
message:
Ensure added references are serialized properly, beef up Workingtreee3
------------------------------------------------------------
revno: 2100.3.9
merged: aaron.bentley at utoronto.ca-20061211033630-96rvmkj06ed66n27
parent: aaron.bentley at utoronto.ca-20061211031105-xne52056x5ozz8yc
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-12-10 22:36:30 -0500
message:
Clean up BzrNewError usage
------------------------------------------------------------
revno: 2100.3.8
merged: aaron.bentley at utoronto.ca-20061211031105-xne52056x5ozz8yc
parent: aaron.bentley at utoronto.ca-20061210184653-qg4kra59ky1gbgyk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-12-10 22:11:05 -0500
message:
Add add_reference
------------------------------------------------------------
revno: 2100.3.7
merged: aaron.bentley at utoronto.ca-20061210184653-qg4kra59ky1gbgyk
parent: aaron.bentley at utoronto.ca-20061210181439-zftpbilg9c0tnbt6
parent: pqm at pqm.ubuntu.com-20061207005113-3b371f625421645e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-12-10 13:46:53 -0500
message:
Merge from mainline
------------------------------------------------------------
revno: 2100.3.6
merged: aaron.bentley at utoronto.ca-20061210181439-zftpbilg9c0tnbt6
parent: aaron.bentley at utoronto.ca-20061210073919-uhgwmvmajy150e8r
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-12-10 13:14:39 -0500
message:
Make add recursive for children of added entries
------------------------------------------------------------
revno: 2100.3.5
merged: aaron.bentley at utoronto.ca-20061210073919-uhgwmvmajy150e8r
parent: aaron.bentley at utoronto.ca-20061128125857-4gjvcrsxna6czlw9
parent: aaron.bentley at utoronto.ca-20061015184856-b41c0532eab3d0c9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-12-10 02:39:19 -0500
message:
Merge nested-trees work
------------------------------------------------------------
revno: 1731.1.51.1.25
merged: aaron.bentley at utoronto.ca-20061015184856-b41c0532eab3d0c9
parent: aaron.bentley at utoronto.ca-20061014160129-b384ee57bbb311b6
parent: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-10-15 14:48:56 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1731.1.51.1.24
merged: aaron.bentley at utoronto.ca-20061014160129-b384ee57bbb311b6
parent: aaron.bentley at utoronto.ca-20061008213516-1608d55ba83da28b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-14 12:01:29 -0400
message:
Fix test case use of get_knit2_format
------------------------------------------------------------
revno: 1731.1.51.1.23
merged: aaron.bentley at utoronto.ca-20061008213516-1608d55ba83da28b
parent: aaron.bentley at utoronto.ca-20061008023449-49b7756fe098e601
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-10-08 17:35:16 -0400
message:
Throw user-friendly error splitting in shared repo with wrong format
------------------------------------------------------------
revno: 1731.1.51.1.22
merged: aaron.bentley at utoronto.ca-20061008023449-49b7756fe098e601
parent: aaron.bentley at utoronto.ca-20061007142258-d8ea546830f1a325
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 22:34:49 -0400
message:
Initial work on split command
------------------------------------------------------------
revno: 1731.1.51.1.21
merged: aaron.bentley at utoronto.ca-20061007142258-d8ea546830f1a325
parent: aaron.bentley at utoronto.ca-20061007141352-84c34ec2904277ec
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 10:22:58 -0400
message:
Ensure extracting a subtree dupes the branch
------------------------------------------------------------
revno: 1731.1.51.1.20
merged: aaron.bentley at utoronto.ca-20061007141352-84c34ec2904277ec
parent: aaron.bentley at utoronto.ca-20061007141151-a312b936c57881d1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 10:13:52 -0400
message:
Add copyright notice to join tests
------------------------------------------------------------
revno: 1731.1.51.1.19
merged: aaron.bentley at utoronto.ca-20061007141151-a312b936c57881d1
parent: aaron.bentley at utoronto.ca-20061007140732-519dc817c6977ae5
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 10:11:51 -0400
message:
update join tests
------------------------------------------------------------
revno: 1731.1.51.1.18
merged: aaron.bentley at utoronto.ca-20061007140732-519dc817c6977ae5
parent: aaron.bentley at utoronto.ca-20061007131720-b9a1a0387f949e2a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 10:07:32 -0400
message:
Get extract in repository under test
------------------------------------------------------------
revno: 1731.1.51.1.17
merged: aaron.bentley at utoronto.ca-20061007131720-b9a1a0387f949e2a
parent: abentley at panoramicfeedback.com-20061002214143-31a300ef43cfd8b8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-10-07 09:17:20 -0400
message:
Support extracting with checkouts
------------------------------------------------------------
revno: 1731.1.51.1.16
merged: abentley at panoramicfeedback.com-20061002214143-31a300ef43cfd8b8
parent: abentley at panoramicfeedback.com-20061002162029-0b63b62e5a5e37d0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-10-02 17:41:43 -0400
message:
Get extract working for standalone trees
------------------------------------------------------------
revno: 1731.1.51.1.15
merged: abentley at panoramicfeedback.com-20061002162029-0b63b62e5a5e37d0
parent: aaron.bentley at utoronto.ca-20060930001629-3fcc62188e83fc29
parent: abentley at panoramicfeedback.com-20061002130518-5aa716794d33cfe3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-10-02 12:20:29 -0400
message:
merge unique-root
------------------------------------------------------------
revno: 1731.1.51.1.14
merged: aaron.bentley at utoronto.ca-20060930001629-3fcc62188e83fc29
parent: aaron.bentley at utoronto.ca-20060930000328-78c16da9332b5120
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-09-29 20:16:29 -0400
message:
Update for API change
------------------------------------------------------------
revno: 1731.1.51.1.13
merged: aaron.bentley at utoronto.ca-20060930000328-78c16da9332b5120
parent: aaron.bentley at utoronto.ca-20060929041439-c15ddb39f20da5df
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-09-29 20:03:28 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1731.1.51.1.12
merged: aaron.bentley at utoronto.ca-20060929041439-c15ddb39f20da5df
parent: aaron.bentley at utoronto.ca-20060929031649-99cc702f6e46771c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-09-29 00:14:39 -0400
message:
Clean up subsume test
------------------------------------------------------------
revno: 1731.1.51.1.11
merged: aaron.bentley at utoronto.ca-20060929031649-99cc702f6e46771c
parent: aaron.bentley at utoronto.ca-20060929031327-defd00b5b5dc75a4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-09-28 23:16:49 -0400
message:
Subsume destroys working tree metadata
------------------------------------------------------------
revno: 1731.1.51.1.10
merged: aaron.bentley at utoronto.ca-20060929031327-defd00b5b5dc75a4
parent: aaron.bentley at utoronto.ca-20060929025007-633f042bc88a3bba
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-09-28 23:13:27 -0400
message:
Change test for rich root data
------------------------------------------------------------
revno: 1731.1.51.1.9
merged: aaron.bentley at utoronto.ca-20060929025007-633f042bc88a3bba
parent: aaron.bentley at utoronto.ca-20060929000831-4c2597019907aa80
parent: abentley at panoramicfeedback.com-20060927212736-60cf96bee720ad83
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-09-28 22:50:07 -0400
message:
Merge destroy_tree from bzr.ab
------------------------------------------------------------
revno: 1731.1.51.1.8
merged: aaron.bentley at utoronto.ca-20060929000831-4c2597019907aa80
parent: abentley at panoramicfeedback.com-20060928210953-20512daf56bbc0f4
parent: aaron.bentley at utoronto.ca-20060929000413-bb6d513b7171b59f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Thu 2006-09-28 20:08:31 -0400
message:
Merge from unique-root
------------------------------------------------------------
revno: 1731.1.51.1.7
merged: abentley at panoramicfeedback.com-20060928210953-20512daf56bbc0f4
parent: abentley at panoramicfeedback.com-20060927170113-baebe28bdb37927b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Thu 2006-09-28 17:09:53 -0400
message:
Add join command
------------------------------------------------------------
revno: 1731.1.51.1.6
merged: abentley at panoramicfeedback.com-20060927170113-baebe28bdb37927b
parent: abentley at panoramicfeedback.com-20060927165525-53295a1b737fb404
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Wed 2006-09-27 13:01:13 -0400
message:
Ensure subsume data survives reopening the tree
------------------------------------------------------------
revno: 1731.1.51.1.5
merged: abentley at panoramicfeedback.com-20060927165525-53295a1b737fb404
parent: abentley at panoramicfeedback.com-20060927161610-a6e0dcc8dedd06eb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Wed 2006-09-27 12:55:25 -0400
message:
Ensure versionedfile will be produced for subsumed tree root
------------------------------------------------------------
revno: 1731.1.51.1.4
merged: abentley at panoramicfeedback.com-20060927161610-a6e0dcc8dedd06eb
parent: aaron.bentley at utoronto.ca-20060927120016-61190f13dfb66355
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Wed 2006-09-27 12:16:10 -0400
message:
Ensure subsume works with Knit2 repos
------------------------------------------------------------
revno: 1731.1.51.1.3
merged: aaron.bentley at utoronto.ca-20060927120016-61190f13dfb66355
parent: aaron.bentley at utoronto.ca-20060927052201-2256fa7dc07a50ac
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-09-27 08:00:16 -0400
message:
Handle unversioned parents during subsume
------------------------------------------------------------
revno: 1731.1.51.1.2
merged: aaron.bentley at utoronto.ca-20060927052201-2256fa7dc07a50ac
parent: aaron.bentley at utoronto.ca-20060927041552-4283b801890541b6
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-09-27 01:22:01 -0400
message:
Test subsume failure modes
------------------------------------------------------------
revno: 1731.1.51.1.1
merged: aaron.bentley at utoronto.ca-20060927041552-4283b801890541b6
parent: aaron.bentley at utoronto.ca-20060927022844-5f7f1374d31fd15b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-09-27 00:15:52 -0400
message:
Initial subsume implementation
------------------------------------------------------------
revno: 2100.3.4
merged: aaron.bentley at utoronto.ca-20061128125857-4gjvcrsxna6czlw9
parent: aaron.bentley at utoronto.ca-20061029195620-4984eff282cb1024
parent: pqm at pqm.ubuntu.com-20061127233027-5ecdd1e9f711b211
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Tue 2006-11-28 07:58:57 -0500
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 2100.3.3
merged: aaron.bentley at utoronto.ca-20061029195620-4984eff282cb1024
parent: aaron.bentley at utoronto.ca-20061029191704-b7221b5e8a873911
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-10-29 14:56:20 -0500
message:
Start of work on format 4 trees
------------------------------------------------------------
revno: 2100.3.2
merged: aaron.bentley at utoronto.ca-20061029191704-b7221b5e8a873911
parent: aaron.bentley at utoronto.ca-20061029183057-af9d71b62956a668
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-10-29 14:17:04 -0500
message:
Add tests for format 7, enforce number
------------------------------------------------------------
revno: 2100.3.1
merged: aaron.bentley at utoronto.ca-20061029183057-af9d71b62956a668
parent: pqm at pqm.ubuntu.com-20061027225241-7339e4c92f55536c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: by-reference-trees
timestamp: Sun 2006-10-29 13:30:57 -0500
message:
Start roundtripping tree-reference entries
Diff too large for email (2955 lines, the limit is 1000).
More information about the bazaar-commits
mailing list