Rev 1993: (robertc) Deprecate WorkingTree.pending_merges. in /home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Sep 8 01:38:12 BST 2006
------------------------------------------------------------
revno: 1993
revision-id: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
parent: pqm at pqm.ubuntu.com-20060907230608-4f18ec1bbe03eb8f
parent: robertc at robertcollins.net-20060908001948-87b1b268cec30ede
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-08 01:38:11 +0100
message:
(robertc) Deprecate WorkingTree.pending_merges.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_version.py test_version.py-20060816024207-ves6ult9a11taj9t-2
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_executable.py test_executable.py-20060628162557-tr7h57kl80l3ma8i-1
bzrlib/tests/workingtree_implementations/test_get_parent_ids.py test_get_parent_ids.py-20060616123734-jq0zc755ud2u644s-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: robertc at robertcollins.net-20060908001948-87b1b268cec30ede
parent: robertc at robertcollins.net-20060905234449-baeb0612c8847493
parent: pqm at pqm.ubuntu.com-20060907230608-4f18ec1bbe03eb8f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Fri 2006-09-08 10:19:48 +1000
message:
Merge bzr.dev and undeprecated WorkingTree.last_revision as per review feedback.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905234449-baeb0612c8847493
parent: robertc at robertcollins.net-20060905231530-8d7d1e497c574089
parent: robertc at robertcollins.net-20060905231840-bd95f673d0205a81
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-09-06 09:44:49 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905231530-8d7d1e497c574089
parent: robertc at robertcollins.net-20060905230803-eceb0203f2f4c238
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-09-06 09:15:30 +1000
message:
WorkingTree.last_revision and WorkingTree.pending_merges are deprecated.
Please use the get_parent_ids (introduced in 0.10) method instead.
(Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905230803-eceb0203f2f4c238
parent: robertc at robertcollins.net-20060905094940-d7ff941c7dfc56a9
parent: robertc at robertcollins.net-20060905230133-2c68611e38fd7922
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-09-06 09:08:03 +1000
message:
Merge improved test deprecation helpers, simplifying handling of deprecated WorkingTree function tests.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905094940-d7ff941c7dfc56a9
parent: robertc at robertcollins.net-20060905081423-b1bc9b092a9f8597
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Tue 2006-09-05 19:49:40 +1000
message:
Deprecated WorkingTree.pending_merges.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905081423-b1bc9b092a9f8597
parent: robertc at robertcollins.net-20060905052834-d84078bf055d0345
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Tue 2006-09-05 18:14:23 +1000
message:
Deprecate WorkingTree.last_revision.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060905052834-d84078bf055d0345
parent: robertc at robertcollins.net-20060901041734-7b9c3e1a65ca2810
parent: pqm at pqm.ubuntu.com-20060904084408-ebdbb37a1cdb0c53
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Tue 2006-09-05 15:28:34 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060901041734-7b9c3e1a65ca2810
parent: robertc at robertcollins.net-20060830063901-eb22406724834a24
parent: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Fri 2006-09-01 14:17:34 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060830063901-eb22406724834a24
parent: robertc at robertcollins.net-20060830043650-bcca487b06085a14
parent: pqm at pqm.ubuntu.com-20060830043844-d570350402a5ad15
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-08-30 16:39:01 +1000
message:
sync with bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060830043650-bcca487b06085a14
parent: robertc at robertcollins.net-20060825065644-41d5b8d507c94d38
parent: robertc at robertcollins.net-20060830041458-c0b772f8932bf454
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Wed 2006-08-30 14:36:50 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060825065644-41d5b8d507c94d38
parent: robertc at robertcollins.net-20060811120610-ae75892349d3f2e4
parent: robertc at robertcollins.net-20060825065618-75b5d54af758e21b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: deprecate-old-tree-parent-apis
timestamp: Fri 2006-08-25 16:56:44 +1000
message:
Merge bzr.dev and fully converted uses of new parents api.
More information about the bazaar-commits
mailing list