Rev 1972: (robertc) Add WorkingTree parent-management apis - set_parent_trees, set_parent_ids, add_parent_tree, add_parent_tree_id. in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed Aug 30 04:40:23 BST 2006
------------------------------------------------------------
revno: 1972
revision-id: pqm at pqm.ubuntu.com-20060830034022-6efbdf5f2a2977f9
parent: pqm at pqm.ubuntu.com-20060830025036-8fdc36a32ac66f72
parent: robertc at robertcollins.net-20060830032604-ea756bf3749f449e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-08-30 04:40:22 +0100
message:
(robertc) Add WorkingTree parent-management apis - set_parent_trees, set_parent_ids, add_parent_tree, add_parent_tree_id.
added:
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: robertc at robertcollins.net-20060830032604-ea756bf3749f449e
parent: robertc at robertcollins.net-20060830030808-2e3e3ced1586d7ea
parent: pqm at pqm.ubuntu.com-20060830025036-8fdc36a32ac66f72
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Wed 2006-08-30 13:26:04 +1000
message:
Merge bzr.dev to resolve conflicts for merging.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060830030808-2e3e3ced1586d7ea
parent: robertc at robertcollins.net-20060825065602-f106e544c3de1f74
parent: robertc at robertcollins.net-20060828064218-09fa4d6e18ff16b2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Wed 2006-08-30 13:08:08 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825065602-f106e544c3de1f74
parent: robertc at robertcollins.net-20060825022146-6e344ca329c52a6e
parent: robertc at robertcollins.net-20060825065550-f931cab451d7dec5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Fri 2006-08-25 16:56:02 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825022146-6e344ca329c52a6e
parent: robertc at robertcollins.net-20060822055251-90587a0c3a067e09
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Fri 2006-08-25 12:21:46 +1000
message:
Adding a parent when the first is a ghost already should not require forcing it.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060822055251-90587a0c3a067e09
parent: robertc at robertcollins.net-20060822054126-195d2ab730e55117
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Tue 2006-08-22 15:52:51 +1000
message:
Apply review feedback - paired with Martin.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060822054126-195d2ab730e55117
parent: robertc at robertcollins.net-20060817042931-5e09ab5a6bb04fe2
parent: robertc at robertcollins.net-20060822054035-74eaacca85abbf26
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Tue 2006-08-22 15:41:26 +1000
message:
Merge from bzr.dev and newer set-last-revision changes.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060817042931-5e09ab5a6bb04fe2
parent: robertc at robertcollins.net-20060817042845-74baf6dc1e04b201
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Thu 2006-08-17 14:29:31 +1000
message:
import cleanup.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060817042845-74baf6dc1e04b201
parent: robertc at robertcollins.net-20060817040114-05649daa22f567ef
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Thu 2006-08-17 14:28:45 +1000
message:
Add a guard against setting the tree last-revision value to a ghost in the new tree parent management api.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060817040114-05649daa22f567ef
parent: robertc at robertcollins.net-20060816072451-b8ce3a65bd71a693
parent: robertc at robertcollins.net-20060817033526-d36c591bf3d93152
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Thu 2006-08-17 14:01:14 +1000
message:
Merge WorkingTree parent rationalisation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060816072451-b8ce3a65bd71a693
parent: robertc at robertcollins.net-20060811052855-d3622775878f20db
parent: pqm at pqm.ubuntu.com-20060815155756-77559a6254704822
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Wed 2006-08-16 17:24:51 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060811052855-d3622775878f20db
parent: robertc at robertcollins.net-20060809112339-2fb0af74cc1495b7
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Fri 2006-08-11 15:28:55 +1000
message:
Add add_parent_tree to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060809112339-2fb0af74cc1495b7
parent: robertc at robertcollins.net-20060809111445-3a5e9647faf96fc0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Wed 2006-08-09 21:23:39 +1000
message:
Add WorkingTree.set_parent_ids.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060809111445-3a5e9647faf96fc0
parent: robertc at robertcollins.net-20060809105648-6507e2184fdbb0d3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Wed 2006-08-09 21:14:45 +1000
message:
Add add_parent_tree_id WorkingTree helper api.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060809105648-6507e2184fdbb0d3
parent: robertc at robertcollins.net-20060807231825-39ebde642c2fc61a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Wed 2006-08-09 20:56:48 +1000
message:
Rename the tree.set_parents tests to tree.parents - preparing to add related function tests. Also remove duplication within the tests by factoring out a helper assert.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060807231825-39ebde642c2fc61a
parent: robertc at robertcollins.net-20060807231721-7ee6e742be7f91ab
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Tue 2006-08-08 09:18:25 +1000
message:
Create and test set_parent_trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060807231721-7ee6e742be7f91ab
parent: pqm at pqm.ubuntu.com-20060806235730-876748deb30a3d2d
parent: robertc at robertcollins.net-20060807105930-0c6d385ab73300c2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: combine set_last_revision and set_pending_merges.
timestamp: Tue 2006-08-08 09:17:21 +1000
message:
Merge set_last_revision loosening branch.
More information about the bazaar-commits
mailing list