Rev 2078: New trees have unique root ids in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sun Oct 15 17:32:31 BST 2006
------------------------------------------------------------
revno: 2078
revision-id: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
parent: aaron.bentley at utoronto.ca-20061015162242-2de5677dd0495500
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-10-15 17:32:29 +0100
message:
New trees have unique root ids
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/textinv.py textinv.py-20050411024435-e3898231b7d1897b26c38878
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/treebuilder.py treebuilder.py-20060907214856-4omn6hf1u7fvrart-1
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061015162242-2de5677dd0495500
parent: aaron.bentley at utoronto.ca-20061015160126-2705455850b0979d
parent: pqm at pqm.ubuntu.com-20061013075108-5846f14f6dfe63b2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 12:22:42 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061015160126-2705455850b0979d
parent: aaron.bentley at utoronto.ca-20061015155957-b44e738e2764352b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 12:01:26 -0400
message:
add NEWS entry
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061015155957-b44e738e2764352b
parent: aaron.bentley at utoronto.ca-20061015155532-d64a63ea5046f693
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 11:59:57 -0400
message:
Use all-lowercase in tree root ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061015155532-d64a63ea5046f693
parent: aaron.bentley at utoronto.ca-20061014162016-63669f40402fd7f8
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sun 2006-10-15 11:55:32 -0400
message:
Fix up more memorytree tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061014162016-63669f40402fd7f8
parent: aaron.bentley at utoronto.ca-20061012031914-036d95e1296a45c4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Sat 2006-10-14 12:20:16 -0400
message:
Avoid committing with None root in test_straightline_ancestry
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061012031914-036d95e1296a45c4
parent: aaron.bentley at utoronto.ca-20061012015046-a5a625ca88adf11c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-10-11 23:19:14 -0400
message:
Changes from review comments
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20061012015046-a5a625ca88adf11c
parent: abentley at panoramicfeedback.com-20061002130518-5aa716794d33cfe3
parent: pqm at pqm.ubuntu.com-20061012005131-810e76839f2b0d1b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-10-11 21:50:46 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20061002130518-5aa716794d33cfe3
parent: aaron.bentley at utoronto.ca-20060930002531-002829a43cd9014b
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: unique-root
timestamp: Mon 2006-10-02 09:05:18 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060930002531-002829a43cd9014b
parent: aaron.bentley at utoronto.ca-20060929000413-bb6d513b7171b59f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Fri 2006-09-29 20:25:31 -0400
message:
Ensure the null revision has no root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060929000413-bb6d513b7171b59f
parent: aaron.bentley at utoronto.ca-20060929000329-d0471ba98bc43652
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 20:04:13 -0400
message:
fix version_info stuff to deliberately include root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060929000329-d0471ba98bc43652
parent: aaron.bentley at utoronto.ca-20060928225604-415f1396ea1d2b97
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 20:03:29 -0400
message:
fix repeated root in WorkingTree.list_files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060928225604-415f1396ea1d2b97
parent: aaron.bentley at utoronto.ca-20060928225018-662b2319008ee69e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 18:56:04 -0400
message:
Fix EmptyTree's default include_root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060928225018-662b2319008ee69e
parent: aaron.bentley at utoronto.ca-20060928020045-c5d9daf00073dbab
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Thu 2006-09-28 18:50:18 -0400
message:
Fix bundle handling
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060928020045-c5d9daf00073dbab
parent: aaron.bentley at utoronto.ca-20060928015743-78fe237142e5446c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-09-27 22:00:45 -0400
message:
Fix revision_tree tests
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060928015743-78fe237142e5446c
parent: aaron.bentley at utoronto.ca-20060928015323-4e7367532c857e87
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-09-27 21:57:43 -0400
message:
Fix testament text now that root are variable
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060928015323-4e7367532c857e87
parent: aaron.bentley at utoronto.ca-20060927022844-5f7f1374d31fd15b
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: unique-root
timestamp: Wed 2006-09-27 21:53:23 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060927022844-5f7f1374d31fd15b
parent: aaron.bentley at utoronto.ca-20060922045217-4e775bf2fc6d0b3b
parent: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Tue 2006-09-26 22:28:44 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060922045217-4e775bf2fc6d0b3b
parent: aaron.bentley at utoronto.ca-20060910201200-828058f367980c5a
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Fri 2006-09-22 00:52:17 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060910201200-828058f367980c5a
parent: aaron.bentley at utoronto.ca-20060910190448-2103188d0f449b1c
parent: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-09-10 16:12:00 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060910190448-2103188d0f449b1c
parent: aaron.bentley at utoronto.ca-20060903204145-8ba5ae2688f4ffdf
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-09-10 15:04:48 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060903204145-8ba5ae2688f4ffdf
parent: aaron.bentley at utoronto.ca-20060817001523-f23f3e0a6260dbc0
parent: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-09-03 16:41:45 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060817001523-f23f3e0a6260dbc0
parent: aaron.bentley at utoronto.ca-20060816231700-43cf87964e43f145
parent: pqm at pqm.ubuntu.com-20060816165353-bc26ccbe32f89d60
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-08-16 20:15:23 -0400
message:
merge from bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060816231700-43cf87964e43f145
parent: abentley at panoramicfeedback.com-20060814160210-d4c1783917db8d5a
parent: pqm at pqm.ubuntu.com-20060815031820-fde63c7ba995e484
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Wed 2006-08-16 19:17:00 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060814160210-d4c1783917db8d5a
parent: abentley at panoramicfeedback.com-20060814155943-41a357981f0303b2
parent: pqm at pqm.ubuntu.com-20060814155317-e2d508d6f2646a4b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-08-14 12:02:10 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060814155943-41a357981f0303b2
parent: abentley at panoramicfeedback.com-20060814141012-1c2e7e95b30001da
parent: abentley at panoramicfeedback.com-20060814154505-f7182110bfcce1bc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-08-14 11:59:43 -0400
message:
Merge more checkout changes
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060814141012-1c2e7e95b30001da
parent: aaron.bentley at utoronto.ca-20060808044819-507b81b4142f7914
parent: abentley at panoramicfeedback.com-20060814134102-f8688153405a8ac7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nested-trees
timestamp: Mon 2006-08-14 10:10:12 -0400
message:
Merge create_checkout_convenience update
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060808044819-507b81b4142f7914
parent: aaron.bentley at utoronto.ca-20060808001903-b7b4cd49ff7b19d3
parent: pqm at pqm.ubuntu.com-20060808002438-4b8baf2d9282e154
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Tue 2006-08-08 00:48:19 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060808001903-b7b4cd49ff7b19d3
parent: aaron.bentley at utoronto.ca-20060807231938-12073b4a70941d3d
parent: aaron.bentley at utoronto.ca-20060808001135-ae94c12d9631f432
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Mon 2006-08-07 20:19:03 -0400
message:
Reject further no-special-roots change
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060807231938-12073b4a70941d3d
parent: aaron.bentley at utoronto.ca-20060807171225-3692f9d3144e202c
parent: aaron.bentley at utoronto.ca-20060807231445-618a867437f6e82c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Mon 2006-08-07 19:19:38 -0400
message:
Reject removing is_root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060807171225-3692f9d3144e202c
parent: aaron.bentley at utoronto.ca-20060806220931-04db236b05c26de6
parent: aaron.bentley at utoronto.ca-20060804235649-c209f0255dc6284c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Mon 2006-08-07 13:12:25 -0400
message:
Merge create_checkout_convenience branch
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806220931-04db236b05c26de6
parent: aaron.bentley at utoronto.ca-20060806212623-17b5708292862d36
parent: aaron.bentley at utoronto.ca-20060806215957-043656291c1fb8ce
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 18:09:31 -0400
message:
Update from no-special-root
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806212623-17b5708292862d36
parent: aaron.bentley at utoronto.ca-20060806212220-3429f614122ac13b
parent: aaron.bentley at utoronto.ca-20060806212422-850ea3d25256bbc1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 17:26:23 -0400
message:
Revert removal of include_root from EmptyTree.list_files
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806212220-3429f614122ac13b
parent: aaron.bentley at utoronto.ca-20060806202314-c11892c514d504fc
parent: aaron.bentley at utoronto.ca-20060806212132-56b40ec5caf87658
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 17:22:20 -0400
message:
Merge restoration of RootEntry and EmptyTree.kind
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806202314-c11892c514d504fc
parent: aaron.bentley at utoronto.ca-20060806002032-c493bfebcdc2f63b
parent: aaron.bentley at utoronto.ca-20060806185906-8c033dc32180fb00
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sun 2006-08-06 16:23:14 -0400
message:
Merge unicode test case fixes
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060806002032-c493bfebcdc2f63b
parent: abentley at panoramicfeedback.com-20060804140846-454dfd62c118d15b
parent: aaron.bentley at utoronto.ca-20060805225938-e8b97cabbe70f571
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nested-trees
timestamp: Sat 2006-08-05 20:20:32 -0400
message:
Revert no-special-root changes
More information about the bazaar-commits
mailing list