Martin Pool
mbp at sourcefrog.net
Wed Nov 23 19:41:16 CST 2005
------------------------------------------------------------
revno: 1435
revision-id: mbp at sourcefrog.net-20051124014111-b73f6da5f344f5ce
parent: mbp at sourcefrog.net-20051123062927-f33c0abd742146af
parent: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Thu 2005-11-24 12:41:11 +1100
message:
[merge] refactoring of branch vs working tree, etc (robertc)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/add.py add.py-20050323030017-3a77d63feda58e33
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/selftest/blackbox.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/selftest/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/selftest/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/selftest/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/selftest/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/selftest/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/selftest/testannotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/selftest/testbranch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/selftest/testfetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/selftest/testinv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/selftest/testlog.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/selftest/testnonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/selftest/testrevisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/selftest/teststatus.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/selftest/testtestament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/selftest/testworkingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/selftest/versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/selftest/whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
merged: robertc at robertcollins.net-20051123071842-ac5f13e1eb9d905b
parent: robertc at robertcollins.net-20051118072940-c0e304e5d0935d86
parent: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Wed 2005-11-23 18:18:42 +1100
message:
Merge from mpool.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118072940-c0e304e5d0935d86
parent: robertc at robertcollins.net-20051118013610-33b08df8810ecca7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 18:29:40 +1100
message:
Nuke __main__ for annotate.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118013610-33b08df8810ecca7
parent: robertc at robertcollins.net-20051118013104-0189bf9fafb6e21a
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:36:10 +1100
message:
clarify use of Branch and WorkingTree in annotate.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118013104-0189bf9fafb6e21a
parent: robertc at robertcollins.net-20051118012015-2c838373b4117f46
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:31:04 +1100
message:
Dont use Branch.open in smart_add when checking for child trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118012015-2c838373b4117f46
parent: robertc at robertcollins.net-20051118011319-39cb6e79d1155a19
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:20:15 +1100
message:
Documentation.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051118011319-39cb6e79d1155a19
parent: robertc at robertcollins.net-20051117225933-612cf96076e37272
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 12:13:19 +1100
message:
bzrlib.add.smart_add_branch is now smart_add_tree. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117225933-612cf96076e37272
parent: robertc at robertcollins.net-20051117225758-4c0f785d2849df07
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:59:33 +1100
message:
Cleanup the working_tree comments in Branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117225758-4c0f785d2849df07
parent: robertc at robertcollins.net-20051117224342-1bd6578c82bd62aa
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:57:58 +1100
message:
move move() from Branch to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117224342-1bd6578c82bd62aa
parent: robertc at robertcollins.net-20051117222954-3404028201eaabd7
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:43:42 +1100
message:
Move rename_one from Branch to WorkingTree. (Robert Collins).
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117222954-3404028201eaabd7
parent: robertc at robertcollins.net-20051117215555-035e7347e08eb7c9
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 09:29:54 +1100
message:
Move Branch.unknowns() to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117215555-035e7347e08eb7c9
parent: robertc at robertcollins.net-20051117081213-cefaacbf5dfb5652
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Fri 2005-11-18 08:55:55 +1100
message:
Move add from Branch to WorkingTree.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117081213-cefaacbf5dfb5652
parent: robertc at robertcollins.net-20051117065251-6f7dcf54580a84ec
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 19:12:13 +1100
message:
Convert most of the front ends commands to use WorkingTree.open_containing
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117065251-6f7dcf54580a84ec
parent: robertc at robertcollins.net-20051117061735-ace312c6dae3f67c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 17:52:51 +1100
message:
Do not consider urls to be relative paths within working trees.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117061735-ace312c6dae3f67c
parent: robertc at robertcollins.net-20051117052111-5f2e91c961f02d5c
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 17:17:35 +1100
message:
Use abspath not realpath in WorkingTree.open_containing, to avoid symlink resolution lies.
------------------------------------------------------------
merged: robertc at robertcollins.net-20051117052111-5f2e91c961f02d5c
parent: robertc at robertcollins.net-20051113201422-8a34ef413bfc8222
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Thu 2005-11-17 16:21:11 +1100
message:
Provide a open_containing for WorkingTree.
More information about the bazaar-commits
mailing list