Rev 1997: Add new format to support nested trees in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sun Sep 10 19:57:22 BST 2006
------------------------------------------------------------
revno: 1997
revision-id: pqm at pqm.ubuntu.com-20060910185720-1bcc17b99fe77687
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
parent: aaron.bentley at utoronto.ca-20060910021831-51f5888a7e62a02d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-09-10 19:57:20 +0100
message:
Add new format to support nested trees
added:
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-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/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inter.py inter.py-20060302012326-a57300cb382c618f
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060910021831-51f5888a7e62a02d
parent: aaron.bentley at utoronto.ca-20060909185257-ce0ee03ee5125ff1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Sat 2006-09-09 22:18:31 -0400
message:
Update from review comments
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060909185257-ce0ee03ee5125ff1
parent: aaron.bentley at utoronto.ca-20060825222518-8f4db8abdb56b17e
parent: pqm at pqm.ubuntu.com-20060909180200-96e41112dff213f3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Sat 2006-09-09 14:52:57 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825222518-8f4db8abdb56b17e
parent: aaron.bentley at utoronto.ca-20060825215159-4c2bbf9c597f0c4b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 18:25:18 -0400
message:
Whitespace fix
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825215159-4c2bbf9c597f0c4b
parent: aaron.bentley at utoronto.ca-20060825215118-352f6465e332ac0a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 17:51:59 -0400
message:
Support experimental knit2 at commandline
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825215118-352f6465e332ac0a
parent: aaron.bentley at utoronto.ca-20060825214947-62b9eea88621dc01
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 17:51:18 -0400
message:
Retrieve only 500 revision trees at once
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825214947-62b9eea88621dc01
parent: aaron.bentley at utoronto.ca-20060825021843-7410628c4371b2fb
parent: abentley at panoramicfeedback.com-20060825161848-99c2e65edfd9ecad
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Fri 2006-08-25 17:49:47 -0400
message:
Merge from other branch
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060825161848-99c2e65edfd9ecad
parent: abentley at panoramicfeedback.com-20060824215105-aac3cbf80b33bae3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Fri 2006-08-25 12:18:48 -0400
message:
Handle inventories with no revision_ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825021843-7410628c4371b2fb
parent: aaron.bentley at utoronto.ca-20060825020646-02fd636892cd576f
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-08-24 22:18:43 -0400
message:
Restore RepositoryFormatKnit1 as the default
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060825020646-02fd636892cd576f
parent: abentley at panoramicfeedback.com-20060824215105-aac3cbf80b33bae3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-08-24 22:06:46 -0400
message:
Clean up clone format creation
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824215105-aac3cbf80b33bae3
parent: abentley at panoramicfeedback.com-20060824195956-e0f01d4fe1fb1e9c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 17:51:05 -0400
message:
Stopped sprout from setting repository_format on _matchingbzrdir
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824195956-e0f01d4fe1fb1e9c
parent: abentley at panoramicfeedback.com-20060824185829-16911fcce7b8e50b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 15:59:56 -0400
message:
Fix checkout bug
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824185829-16911fcce7b8e50b
parent: abentley at panoramicfeedback.com-20060824183724-7a648a260a5b587d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 14:58:29 -0400
message:
Fix info test to use knit1 for bound branches
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824183724-7a648a260a5b587d
parent: abentley at panoramicfeedback.com-20060824164500-d46c1e2c45d06147
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 14:37:24 -0400
message:
Handle empty commits, fix test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824164500-d46c1e2c45d06147
parent: abentley at panoramicfeedback.com-20060824154907-67295a1f6ed299b5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 12:45:00 -0400
message:
Get upgrade from format4 under test and fixed for all formats
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824154907-67295a1f6ed299b5
parent: abentley at panoramicfeedback.com-20060824135626-1966834952027cf7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 11:49:07 -0400
message:
Better fix for convesion test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824135626-1966834952027cf7
parent: abentley at panoramicfeedback.com-20060824134807-9067153963809b6c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 09:56:26 -0400
message:
Ensure we get a Knit1 in conversion test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824134807-9067153963809b6c
parent: abentley at panoramicfeedback.com-20060824134032-a0697d7c3604756b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 09:48:07 -0400
message:
Fix default format test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060824134032-a0697d7c3604756b
parent: aaron.bentley at utoronto.ca-20060824033548-104450f485b42c75
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-24 09:40:32 -0400
message:
Handle capital-letter file-ids
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060824033548-104450f485b42c75
parent: aaron.bentley at utoronto.ca-20060824014206-bd2263d3f0c80a26
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 23:35:48 -0400
message:
Fix bugs in basis inventory handling, change filename
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060824014206-bd2263d3f0c80a26
parent: aaron.bentley at utoronto.ca-20060824011334-2ad4529b3eb1a038
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 21:42:06 -0400
message:
Make RepositoryFormatKnit2 the default (for testing)
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060824011334-2ad4529b3eb1a038
parent: abentley at panoramicfeedback.com-20060823181736-a36a1d286cfed4be
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 21:13:34 -0400
message:
Fix up sprout, nuke workaround
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823181736-a36a1d286cfed4be
parent: abentley at panoramicfeedback.com-20060823175017-81ab8d717a4228ad
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 14:17:36 -0400
message:
Fix sprout for fileid involved test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823175017-81ab8d717a4228ad
parent: abentley at panoramicfeedback.com-20060823170820-dbdf5a6ffd020c6c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 13:50:17 -0400
message:
Fixed conversion test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823170820-dbdf5a6ffd020c6c
parent: abentley at panoramicfeedback.com-20060823153340-f9c4bdf70a3e4457
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 13:08:20 -0400
message:
Fix up some test cases
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823153340-f9c4bdf70a3e4457
parent: abentley at panoramicfeedback.com-20060823152119-7b8e92f344f65b35
parent: pqm at pqm.ubuntu.com-20060823140849-674057caaed0edc0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 11:33:40 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823152119-7b8e92f344f65b35
parent: abentley at panoramicfeedback.com-20060823131545-fb490208e25b82e0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 11:21:19 -0400
message:
Got intra-repository fetch working between model1 and 2 for all types
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060823131545-fb490208e25b82e0
parent: aaron.bentley at utoronto.ca-20060823042506-98adf009e8bd90d1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-08-23 09:15:45 -0400
message:
Fix up test cases that manually construct inventories
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060823042506-98adf009e8bd90d1
parent: aaron.bentley at utoronto.ca-20060822224421-c1a6e96d13785cba
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Wed 2006-08-23 00:25:06 -0400
message:
Make commits preserve root entry data
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060822224421-c1a6e96d13785cba
parent: abentley at panoramicfeedback.com-20060822215047-43838f0c93497109
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Tue 2006-08-22 18:44:21 -0400
message:
Remove workingtree 4 for now
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822215047-43838f0c93497109
parent: abentley at panoramicfeedback.com-20060822203753-b6c1b05b757efda0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 17:50:47 -0400
message:
Add WorkingTreeFormat4
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822203753-b6c1b05b757efda0
parent: abentley at panoramicfeedback.com-20060822184032-6417522b3ab98f69
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 16:37:53 -0400
message:
Test whether revision id for root is retained
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822184032-6417522b3ab98f69
parent: abentley at panoramicfeedback.com-20060822181146-9d1b10a76fd1ec21
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 14:40:32 -0400
message:
Implement creation of knits for tree roots
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822181146-9d1b10a76fd1ec21
parent: abentley at panoramicfeedback.com-20060822165718-9b3c880b36bf2276
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 14:11:46 -0400
message:
Get fetching from 1 to 2 under test
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822165718-9b3c880b36bf2276
parent: abentley at panoramicfeedback.com-20060822161417-29c1eb4790285db9
parent: pqm at pqm.ubuntu.com-20060822164041-3ff8e0735c0cb7c0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 12:57:18 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060822161417-29c1eb4790285db9
parent: abentley at panoramicfeedback.com-20060818205305-2df0367482c62222
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-08-22 12:14:17 -0400
message:
Back out inter.get changes, make optimizers an ordered list
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060818205305-2df0367482c62222
parent: abentley at panoramicfeedback.com-20060817220230-959cf1bc3f61b57e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Fri 2006-08-18 16:53:05 -0400
message:
Fail when trying to use interrepository on Knit2 and Knit1
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060817220230-959cf1bc3f61b57e
parent: abentley at panoramicfeedback.com-20060817195154-af960bfc59351ebf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-17 18:02:30 -0400
message:
Start work on converter
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060817195154-af960bfc59351ebf
parent: aaron.bentley at utoronto.ca-20060817120634-8d9db345165c55d9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-08-17 15:51:54 -0400
message:
Implement knit repo format 2
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060817120634-8d9db345165c55d9
parent: aaron.bentley at utoronto.ca-20060817013139-9f128dc0fbddadca
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-08-17 08:06:34 -0400
message:
Start work on Knit format 2
More information about the bazaar-commits
mailing list