Rev 1456: Merge from jam-integration. in
/home/robertc/source/baz/integration/
Robert Collins
robertc at robertcollins.net
Wed Feb 1 21:13:40 GMT 2006
------------------------------------------------------------
revno: 1456
revision-id: robertc at robertcollins.net-20060201211329-b3faf2a411316ff7
parent: robertc at robertcollins.net-20060131044410-50e7a77576907473
parent: john at arbash-meinel.com-20060201141338-d211b93a6adfa691
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2006-02-02 08:13:29 +1100
message:
Merge from jam-integration.
removed:
bzrlib/tests/test_remove.py test_remove.py-20051212071329-1925f463b565a5c3
added:
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/branch_implementations/ branch_implementations-20060123013029-45ffae35c99eae60
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_doc_generate.py test_doc_generate.py-20051224124638-88da58fc872b93ba
bzrlib/transport/readonly.py readonly.py-20060120032407-66d3166c39ffdc79
generate_docs.py bzrinfogen.py-20051211224525-78e7c14f2c955e55
tools/__init__.py __init__.py-20051212012857-39c9a39aa197f064
tools/doc_generate/ bzrinfogen-20051211214907-45ff5f0af3a80b32
tools/doc_generate/__init__.py __init__.py-20051211214907-df9e0e6b493553f1
tools/doc_generate/autodoc_bash_completion.py big_bash_completion.py-20051211223059-00ecfbfcc8056b78
renamed:
bzr_man.py => tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
bzrlib/tests/test_branch.py => bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_status.py => bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_changeset.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/merge.py* merge.py-20050513021216-953b65a438527106
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/text.py text.py-20050928201105-c26468dcb5d9b18b
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
bzrlib/tests/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
bzrlib/tests/test_nonascii.py testnonascii.py-20051018022645-ea1d8b6477b058a6
bzrlib/tests/test_parent.py test_parent.py-20050830052751-5e62766623c32222
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_revprops.py testrevprops.py-20051013073044-92bc3c68302ce1bf
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
------------------------------------------------------------
merged: john at arbash-meinel.com-20060201141338-d211b93a6adfa691
parent: john at arbash-meinel.com-20060201140859-95012ca532c0172b
parent: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-02-01 08:13:38 -0600
message:
[merge] bzr.dev 1528, including branch-formats
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060201130813-1240ac51411d1330
parent: mbp at sourcefrog.net-20060201063713-4cb4d1afcaeba538
parent: mbp at sourcefrog.net-20060201124612-9d8bc9fecf4ca61f
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Thu 2006-02-02 00:08:13 +1100
message:
[merge] land Robert's branch-formats branch
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060201124612-9d8bc9fecf4ca61f
parent: mbp at sourcefrog.net-20060201122435-53f3efb1b5749fe1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.merge.branch-formats
timestamp: Wed 2006-02-01 23:46:12 +1100
message:
Deprecation warnings for popular APIs that will change in BzrDir
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060201122435-53f3efb1b5749fe1
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
parent: robertc at robertcollins.net-20060126223910-4500ee14cdc22d64
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.merge.branch-formats
timestamp: Wed 2006-02-01 23:24:35 +1100
message:
[merge] branch-formats branch, and reconcile changes
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126223910-4500ee14cdc22d64
parent: robertc at robertcollins.net-20060126223047-f8e3740a44339978
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 09:39:10 +1100
message:
Rename deprecated_nonce to DEPRECATED_PARAMETER
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126223047-f8e3740a44339978
parent: robertc at robertcollins.net-20060126221504-254f5ccbbcb16c15
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 09:30:47 +1100
message:
cleanedup test_outside_wt
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126221504-254f5ccbbcb16c15
parent: robertc at robertcollins.net-20060126214406-6727c356b2ba10a0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 09:15:04 +1100
message:
Test signature preservation on clone and upgrade.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126214406-6727c356b2ba10a0
parent: robertc at robertcollins.net-20060126205258-fcf323f36c57112b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 08:44:06 +1100
message:
Revision signature storing is on repository now.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060126205258-fcf323f36c57112b
parent: robertc at robertcollins.net-20060125060036-6bbfdc10d87b35e5
parent: robertc at robertcollins.net-20060125055408-decd09a9f3f91658
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-27 07:52:58 +1100
message:
first cut at merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060125060036-6bbfdc10d87b35e5
parent: robertc at robertcollins.net-20060124044433-d0103f34848a9558
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Wed 2006-01-25 17:00:36 +1100
message:
update TODO
------------------------------------------------------------
merged: robertc at robertcollins.net-20060124044433-d0103f34848a9558
parent: robertc at robertcollins.net-20060123034325-508ad07a2559d115
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Tue 2006-01-24 15:44:33 +1100
message:
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060123034325-508ad07a2559d115
parent: robertc at robertcollins.net-20060123014232-caba4df1b7e1259e
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-23 14:43:25 +1100
message:
Add a --transport parameter to the test suite to set the default transport to be used in the test suite.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060123014232-caba4df1b7e1259e
parent: robertc at robertcollins.net-20060123014028-89452b2ed32e4651
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-23 12:42:32 +1100
message:
update (C) on branch_implementations/__init__.py
------------------------------------------------------------
merged: robertc at robertcollins.net-20060123014028-89452b2ed32e4651
parent: robertc at robertcollins.net-20060122224902-2c68cdc75bceb408
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-23 12:40:28 +1100
message:
Move branch implementations tests into a package.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060122224902-2c68cdc75bceb408
parent: robertc at robertcollins.net-20060122114307-487fe8584d86d597
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-23 09:49:02 +1100
message:
update TODOs and move abstract methods that were misplaced on BzrBranchFormat5 to Branch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060122114307-487fe8584d86d597
parent: robertc at robertcollins.net-20060121113408-0429a0817c693c37
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sun 2006-01-22 22:43:07 +1100
message:
Extend the copy_to tests to smoke test server-to-same-server copies to catch optimised code paths, and fix sftps optimised code path by removing dead code.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121113408-0429a0817c693c37
parent: robertc at robertcollins.net-20060121113015-c631e38e958d0dee
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sat 2006-01-21 22:34:08 +1100
message:
Add TODO.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121113015-c631e38e958d0dee
parent: robertc at robertcollins.net-20060121110429-8883570a51449565
parent: robertc at robertcollins.net-20060121104713-1ccd09539b35a07b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sat 2006-01-21 22:30:15 +1100
message:
merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060121110429-8883570a51449565
parent: robertc at robertcollins.net-20060120234452-3df6c9440800110b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sat 2006-01-21 22:04:29 +1100
message:
update TODO.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120234452-3df6c9440800110b
parent: robertc at robertcollins.net-20060120224536-44e2f4c17879f9a0
parent: robertc at robertcollins.net-20060118011340-ab7ab3d0ecc47c0f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sat 2006-01-21 10:44:52 +1100
message:
merge from integration.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120224536-44e2f4c17879f9a0
parent: robertc at robertcollins.net-20060120090619-c6e6e34e54fd99fe
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Sat 2006-01-21 09:45:36 +1100
message:
Last vestiges of local file requirements for upgrade nuked
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120090619-c6e6e34e54fd99fe
parent: robertc at robertcollins.net-20060120070028-5ffb6a61e660c09b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 20:06:19 +1100
message:
Remove shutil dependency in upgrade - create a delete_tree method for transports.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120070028-5ffb6a61e660c09b
parent: robertc at robertcollins.net-20060120062320-cb96c6d5fecadcd2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 18:00:28 +1100
message:
Replace copy_tree with transport logic in upgreade.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120062320-cb96c6d5fecadcd2
parent: robertc at robertcollins.net-20060120055716-00ab1d29129a68ff
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 17:23:20 +1100
message:
Give a reasonable warning on attempts to upgrade a readonly url.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120055716-00ab1d29129a68ff
parent: robertc at robertcollins.net-20060120054715-f5ea35d42b9c3938
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 16:57:16 +1100
message:
Tweak formats implementation test to exercise readonly and readwrite transports.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120054715-f5ea35d42b9c3938
parent: robertc at robertcollins.net-20060120050441-818215bbba269589
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 16:47:15 +1100
message:
Convert test_open_containing from being a Remote test to being the more accurate Chrooted test.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120050441-818215bbba269589
parent: robertc at robertcollins.net-20060120032422-62237a61b04453cd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 16:04:41 +1100
message:
Add TestCaseWithTransport class that provides tests with read and write transport pairs.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120032422-62237a61b04453cd
parent: robertc at robertcollins.net-20060120011003-ff01286aee2d07c2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 14:24:22 +1100
message:
Add a readonly decorator for transports.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120011003-ff01286aee2d07c2
parent: robertc at robertcollins.net-20060120001804-4f4fce08348cae54
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 12:10:03 +1100
message:
Unfuck upgrade.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060120001804-4f4fce08348cae54
parent: robertc at robertcollins.net-20060118052109-f93523ebe8868ce6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Fri 2006-01-20 11:18:04 +1100
message:
Move downlevel check up to the Branch.open logic, removing it from the Branch constructor and deprecating relax_version_check to the same.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060118052109-f93523ebe8868ce6
parent: robertc at robertcollins.net-20060116231610-79021f5b63d883f6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Wed 2006-01-18 16:21:09 +1100
message:
Remove last uses of the init= parameter to BzrBranch.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060116231610-79021f5b63d883f6
parent: robertc at robertcollins.net-20060116073453-80b3e1ef7706d097
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Tue 2006-01-17 10:16:10 +1100
message:
Turn branch format.open into a factory.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060116073453-80b3e1ef7706d097
parent: robertc at robertcollins.net-20060116065615-01948b690e9f8842
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-16 18:34:53 +1100
message:
Make BzrBranchFormat.find_format take a transport not a url for efficiency.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060116065615-01948b690e9f8842
parent: robertc at robertcollins.net-20060115205932-8dd2cea5129cae8a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-16 17:56:15 +1100
message:
Implement BranchTestProviderAdapter, so tests now run across all branch formats.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060115205932-8dd2cea5129cae8a
parent: robertc at robertcollins.net-20060112052540-2fe6e566d6ebf605
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Mon 2006-01-16 07:59:32 +1100
message:
Introduce BranchFormats - factoring out intialisation of Branches.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060112052540-2fe6e566d6ebf605
parent: robertc at robertcollins.net-20060112024225-fe991391e088dd58
committer: Robert Collins <robertc at robertcollins.net>
branch nick: branch-formats
timestamp: Thu 2006-01-12 16:25:40 +1100
message:
Allow parameterisation of the branch initialisation for bzrlib.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060201063713-4cb4d1afcaeba538
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev (Main development branch)
timestamp: Wed 2006-02-01 17:37:13 +1100
message:
Improved help text for bzr selftest
------------------------------------------------------------
merged: john at arbash-meinel.com-20060201140859-95012ca532c0172b
parent: john at arbash-meinel.com-20060131200102-1cc580967bd9fe7b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Wed 2006-02-01 08:08:59 -0600
message:
Make --no-plugins actually disable plugin loading.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131200102-1cc580967bd9fe7b
parent: john at arbash-meinel.com-20060131155102-e943b3e4b2de830b
parent: john at arbash-meinel.com-20060131140911-3bc59456e076f236
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 14:01:02 -0600
message:
[merge] log reweave errors.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131140911-3bc59456e076f236
parent: john at arbash-meinel.com-20060130010259-39020721b61b67b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Tue 2006-01-31 08:09:11 -0600
message:
When reweaving weaves, if texts don't match, log the differences rather than a plain assert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060130010259-39020721b61b67b1
parent: john at arbash-meinel.com-20060125175627-e27c2a32c0b2bae9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Sun 2006-01-29 19:02:59 -0600
message:
cleanups suggested by Robert.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060125175627-e27c2a32c0b2bae9
parent: john at arbash-meinel.com-20060125174402-b190e69756b5a7d7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Wed 2006-01-25 11:56:27 -0600
message:
Add progress message to long-running inventory merge, and weave.reweave. Remove copy_to progress from _copy_one, since it only has 1 item to copy
------------------------------------------------------------
merged: john at arbash-meinel.com-20060125174402-b190e69756b5a7d7
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-fix-weave-join
timestamp: Wed 2006-01-25 11:44:02 -0600
message:
Fixing Weave.join() so that it uses the optimized path, and doesn't require Reweave for different parent order or repeated parents.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131155102-e943b3e4b2de830b
parent: john at arbash-meinel.com-20060131153347-6557db0336f7cdf1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 09:51:02 -0600
message:
Minor pep8 cleanups to previous revision
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131153347-6557db0336f7cdf1
parent: john at arbash-meinel.com-20060131145242-c2495bbc9756d9f3
parent: jblack at merconline.com-20060130054458-05b5b89478d482bc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 09:33:47 -0600
message:
[merge] James Blackwell, Hans Ulrich Niedermann: manpage fixes
------------------------------------------------------------
merged: jblack at merconline.com-20060130054458-05b5b89478d482bc
parent: jblack at merconline.com-20060130054213-e0def1bfce8612b8
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-30 00:44:58 -0500
message:
fixed news
------------------------------------------------------------
merged: jblack at merconline.com-20060130054213-e0def1bfce8612b8
parent: jblack at merconline.com-20060130043701-46ceed1e4710a352
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2006-01-30 00:42:13 -0500
message:
pep8ifying
------------------------------------------------------------
merged: jblack at merconline.com-20060130043701-46ceed1e4710a352
parent: jblack at merconline.com-20060130042608-b40dc90fc24956e0
parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-01-29 23:37:01 -0500
message:
Merged mailine
------------------------------------------------------------
merged: jblack at merconline.com-20060130042608-b40dc90fc24956e0
parent: jblack at pluto-20051224124652-834664088ac33b20
committer: James Blackwell <jblack at merconline.com>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2006-01-29 23:26:08 -0500
message:
Fixed bzr.conf problem
------------------------------------------------------------
merged: jblack at pluto-20051224124652-834664088ac33b20
parent: jblack at pluto-20051224123724-b6110d74176a0442
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sat 2005-12-24 07:46:52 -0500
message:
Added smoke test for doc_generate
------------------------------------------------------------
merged: jblack at pluto-20051224123724-b6110d74176a0442
parent: jblack at pluto-20051212075724-c5cf07c6a7b3e750
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sat 2005-12-24 07:37:24 -0500
message:
Merged from mainline
------------------------------------------------------------
merged: jblack at pluto-20051212075724-c5cf07c6a7b3e750
parent: jblack at pluto-20051212033802-fc9c7272281121c9
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Mon 2005-12-12 02:57:24 -0500
message:
Fix up setup.py to call the manpage generation
------------------------------------------------------------
merged: jblack at pluto-20051212033802-fc9c7272281121c9
parent: jblack at pluto-20051212021621-a3151675c1f8a9c9
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 22:38:02 -0500
message:
NEWS file
------------------------------------------------------------
merged: jblack at pluto-20051212021621-a3151675c1f8a9c9
parent: jblack at pluto-20051212021126-a7ffba4393d3a9eb
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 21:16:21 -0500
message:
Fixing docstring for bzrhelp
------------------------------------------------------------
merged: jblack at pluto-20051212021126-a7ffba4393d3a9eb
parent: jblack at pluto-20051212012915-9b0caaaf70aeffe3
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 21:11:26 -0500
message:
Final tuning
------------------------------------------------------------
merged: jblack at pluto-20051212012915-9b0caaaf70aeffe3
parent: jblack at pluto-20051212012627-a5637b074fce751b
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 20:29:15 -0500
message:
needed __init__ in tools
------------------------------------------------------------
merged: jblack at pluto-20051212012627-a5637b074fce751b
parent: jblack at pluto-20051212010719-31777648cf2e762f
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 20:26:27 -0500
message:
Final wrapup on doc generation
------------------------------------------------------------
merged: jblack at pluto-20051212010719-31777648cf2e762f
parent: jblack at pluto-20051212003421-e2aa1fe9efd780ac
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 20:07:19 -0500
message:
Better help for doc_generate
------------------------------------------------------------
merged: jblack at pluto-20051212003421-e2aa1fe9efd780ac
parent: jblack at pluto-20051212001509-a28b6c6e9618d973
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 19:34:21 -0500
message:
Updating plan
------------------------------------------------------------
merged: jblack at pluto-20051212001509-a28b6c6e9618d973
parent: jblack at pluto-20051212000725-762c2850e04f38ca
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 19:15:09 -0500
message:
Fixing up autodoc
------------------------------------------------------------
merged: jblack at pluto-20051212000725-762c2850e04f38ca
parent: jblack at pluto-20051211235309-bbaa35713c759536
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 19:07:25 -0500
message:
Going closer to ndim
------------------------------------------------------------
merged: jblack at pluto-20051211235309-bbaa35713c759536
parent: jblack at pluto-20051211233848-1fea0a14c5c8fd59
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 18:53:09 -0500
message:
Hacked up ndim's code
------------------------------------------------------------
merged: jblack at pluto-20051211233848-1fea0a14c5c8fd59
parent: jblack at pluto-20051210014156-319193e3647d916e
parent: hun at n-dimensional.de-20051211231127-442e97a4dcd3533f
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Sun 2005-12-11 18:38:48 -0500
message:
- Pulling generated docs into one place, though whether bash completion is
documents is arguable....
- Bash completion generator. [Hans Ulrich Niedermann]
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211231127-442e97a4dcd3533f
parent: hun at n-dimensional.de-20051211230421-3e5789fc1fa93ead
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: ndim's improvements over jblack's bzr_man.py simplification
timestamp: Mon 2005-12-12 00:11:27 +0100
message:
more bzr-infogen docs
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211230421-3e5789fc1fa93ead
parent: hun at n-dimensional.de-20051211230150-77dc6510d8613f5f
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: ndim's improvements over jblack's bzr_man.py simplification
timestamp: Mon 2005-12-12 00:04:21 +0100
message:
rename bzr-infogen.py option -f to more standard-like -o
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211230150-77dc6510d8613f5f
parent: hun at n-dimensional.de-20051211224659-0f055c115c4dd309
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: ndim's improvements over jblack's bzr_man.py simplification
timestamp: Mon 2005-12-12 00:01:50 +0100
message:
bzr-infogen.py cosmetics
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211224659-0f055c115c4dd309
parent: hun at n-dimensional.de-20051211224136-a15b0e4b1212c520
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sun 2005-12-11 23:46:59 +0100
message:
Implement the bzr documentation/information autogeneration plan:
* Add bzr-infogen.py script.
* Moved main() from bzrinfogen/__init__py to bzr-infogen.py where it belongs
Still missing:
* test case for autogeneration
* actual implementation of bash completion script
------------------------------------------------------------
merged: hun at n-dimensional.de-20051211224136-a15b0e4b1212c520
parent: hun at n-dimensional.de-20051210183215-f3ee423778e7ea06
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sun 2005-12-11 23:41:36 +0100
message:
Implement the bzr documentation/information autogeneration plan:
* Add new module bzrinfogen.
* Add bzrinfogen/__init__py which implements the infogen infrastructure.
* Add bzrinfogen/big_bash_completion.py:
Generates (unusable prototype) bash completion script from internal
information on bzr commands and options
* Moved bzr_man.py to bzrinfogen/big_man.py and ported it to the new
interface.
Still missing:
* test case for autogeneration
* actual implementation of bash completion script
------------------------------------------------------------
merged: hun at n-dimensional.de-20051210183215-f3ee423778e7ea06
parent: hun at n-dimensional.de-20051210171004-b0abbc0256065eed
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sat 2005-12-10 19:32:15 +0100
message:
baz_man.py: factor out command list generation; add TODO list
------------------------------------------------------------
merged: hun at n-dimensional.de-20051210171004-b0abbc0256065eed
parent: jblack at pluto-20051210014156-319193e3647d916e
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
branch nick: bzr-help-ndim
timestamp: Sat 2005-12-10 18:10:04 +0100
message:
Start implementing general doc generation plan:
* describe the plan
* steal some code from bzrlib.help to extract command help
* use subsections for each bzr command
* add COMMAND OVERVIEW section
* add USAGE section with a few common use cases
* remove copyright marks as I am going to sign over copyright to Canonical
------------------------------------------------------------
merged: jblack at pluto-20051210014156-319193e3647d916e
parent: jblack at pluto-20051210013541-4b1bfd42eb42584b
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 20:41:56 -0500
message:
Minor fixes to tutorial
------------------------------------------------------------
merged: jblack at pluto-20051210013541-4b1bfd42eb42584b
parent: jblack at pluto-20051210012930-d3fce189273c9fa6
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 20:35:41 -0500
message:
Fixing NEWS
------------------------------------------------------------
merged: jblack at pluto-20051210012930-d3fce189273c9fa6
parent: jblack at pluto-20051210000050-f24530fd02918c61
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 20:29:30 -0500
message:
Give long help with command on man page
------------------------------------------------------------
merged: jblack at pluto-20051210000050-f24530fd02918c61
parent: jblack at pluto-20051209234840-9f00d87c354b5c7b
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 19:00:50 -0500
message:
Marked which parts of file is owned by Hans
------------------------------------------------------------
merged: jblack at pluto-20051209234840-9f00d87c354b5c7b
parent: jblack at pluto-20051209234750-184fa848e8023670
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 18:48:40 -0500
message:
man_page.py, Canonical Ltd., not Canonical
------------------------------------------------------------
merged: jblack at pluto-20051209234750-184fa848e8023670
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
parent: hun at n-dimensional.de-20051209214826-c763355e488d6b32
committer: James Blackwell <jblack at pluto>
branch nick: bzr.dev (Main development branch)
timestamp: Fri 2005-12-09 18:47:50 -0500
message:
Update for .bazaar.conf [Hans Ulrich Niedermann]
------------------------------------------------------------
merged: hun at n-dimensional.de-20051209214826-c763355e488d6b32
parent: hun at n-dimensional.de-20051206182459-85151abe047f8e59
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
timestamp: Fri 2005-12-09 22:48:26 +0100
message:
ignore BRANCH-INFO file
------------------------------------------------------------
merged: hun at n-dimensional.de-20051206182459-85151abe047f8e59
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Hans Ulrich Niedermann <hun at n-dimensional.de>
timestamp: Tue 2005-12-06 19:24:59 +0100
message:
Adapted man page generator and templates to bzr 0.6:
* Added links to the docs at http://bazaar.canonical.com/
* Document ~/.bazaar/* instead of ~/.bzr.conf/*
* Document BZR_HOME variable
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131145242-c2495bbc9756d9f3
parent: john at arbash-meinel.com-20060131144844-73cc30d65de20db5
parent: Matthieu.Moy at imag.fr-20060131132251-22fb294ef6a8e1b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:52:42 -0600
message:
[merge] Matthieu Moy & Daniel Silverstone, ftp fixes
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131132251-22fb294ef6a8e1b1
parent: Matthieu.Moy at imag.fr-20060131114527-863611ab7b8a0b3f
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 14:22:51 +0100
message:
Credit myself in NEWS. Mentionned FTP connections reuse.
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131114527-863611ab7b8a0b3f
parent: Matthieu.Moy at imag.fr-20060131092814-3b09f3122a0e0308
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 12:45:27 +0100
message:
Updated the NEWS file
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131092814-3b09f3122a0e0308
parent: Matthieu.Moy at imag.fr-20060131090300-3844a0f05fc99736
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 10:28:14 +0100
message:
Raise NoSuchFile in stat when this is the case
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060131090300-3844a0f05fc99736
parent: Matthieu.Moy at imag.fr-20060130190238-e55cacdc28eab6bd
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Tue 2006-01-31 10:03:00 +0100
message:
better error messages on ftp failures
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130190238-e55cacdc28eab6bd
parent: Matthieu.Moy at imag.fr-20060130190156-4a4fd09d31569532
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 20:02:38 +0100
message:
Sleep between retries when the connection closes
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130190156-4a4fd09d31569532
parent: Matthieu.Moy at imag.fr-20060130171033-8eb598010e4850c6
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 20:01:56 +0100
message:
Make ftp put atomic
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130171033-8eb598010e4850c6
parent: Matthieu.Moy at imag.fr-20060130164531-7f10ecf57240aa99
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 18:10:33 +0100
message:
made __number_of_retries global
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130164531-7f10ecf57240aa99
parent: Matthieu.Moy at imag.fr-20060130163816-887c6d44b41ce3be
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 17:45:31 +0100
message:
merge from bzr.dev
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130163816-887c6d44b41ce3be
parent: Matthieu.Moy at imag.fr-20060130064458-ec73d1f3c287df01
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 17:38:16 +0100
message:
One 1 -> _number_of_retries was missing
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060130064458-ec73d1f3c287df01
parent: Matthieu.Moy at imag.fr-20060128203303-38a32c095f31c7ad
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Mon 2006-01-30 07:44:58 +0100
message:
suggestions by jam and robertc
------------------------------------------------------------
merged: Matthieu.Moy at imag.fr-20060128203303-38a32c095f31c7ad
parent: dsilvers at digital-scurf.org-20060112121704-cc3026dbfc1dc6a6
committer: Matthieu Moy <Matthieu.Moy at imag.fr>
branch nick: bzr.ftp
timestamp: Sat 2006-01-28 21:33:03 +0100
message:
try to solve the problem of ftp servers closing the connection
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20060112121704-cc3026dbfc1dc6a6
parent: dsilvers at digital-scurf.org-20060110163059-0f4ec1fab71127ba
parent: mbp at sourcefrog.net-20060112063723-4ec91b5ff30f0830
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Thu 2006-01-12 12:17:04 +0000
message:
Merge from Martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20060110163059-0f4ec1fab71127ba
parent: dsilvers at digital-scurf.org-20060109105147-17dd71ee850f7a60
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Tue 2006-01-10 16:30:59 +0000
message:
Add a NEWS item about bzr missing
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20060109105147-17dd71ee850f7a60
parent: dsilvers at digital-scurf.org-20051212125410-d41faeac886c1187
parent: mbp at sourcefrog.net-20060109015138-d6d6eeb91df1ff0a
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Mon 2006-01-09 10:51:47 +0000
message:
Merge from martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051212125410-d41faeac886c1187
parent: dsilvers at digital-scurf.org-20051206142634-86cd90cf8ae4fa08
parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Mon 2005-12-12 12:54:10 +0000
message:
Merge Martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051206142634-86cd90cf8ae4fa08
parent: dsilvers at digital-scurf.org-20051130150710-61c3a2757ed2d37f
parent: mbp at sourcefrog.net-20051206065325-54ba77d544b4501a
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Tue 2005-12-06 14:26:34 +0000
message:
Merge from martin
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051130150710-61c3a2757ed2d37f
parent: dsilvers at digital-scurf.org-20051130150049-9c05b534db8aaed4
parent: abentley at panoramicfeedback.com-20051129211134-2e69b6ad9ef11c85
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 15:07:10 +0000
message:
Merge in aaron's new missing builtin, fix conflict over it in builtins.py
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051130150049-9c05b534db8aaed4
parent: mbp at sourcefrog.net-20051130064100-50469cf3ee5f42b2
parent: dsilvers at digital-scurf.org-20051117174135-9976b3539124644a
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 15:00:49 +0000
message:
Merge in ftp.py fixes
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051117174135-9976b3539124644a
parent: dsilvers at digital-scurf.org-20051117174009-85f9b63b34e48bd1
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 17:41:35 +0000
message:
Make sure put raises NoSuchFile on appropriate errors. Also ensure we only ever connect once. Seriously. Really.
------------------------------------------------------------
merged: dsilvers at digital-scurf.org-20051117174009-85f9b63b34e48bd1
parent: dsilvers at digital-scurf.org-20051116162412-3830d783879122c7
parent: mbp at sourcefrog.net-20051117074538-5e113b7ad19a3b5d
committer: Daniel Silverstone <dsilvers at digital-scurf.org>
branch nick: bzr.dev
timestamp: Thu 2005-11-17 17:40:09 +0000
message:
Merge from Martin
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131144844-73cc30d65de20db5
parent: john at arbash-meinel.com-20060131142738-5216651eedf189e1
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:48:44 -0600
message:
[merge] bzr.dev which merged jam-pending
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131142738-5216651eedf189e1
parent: john at arbash-meinel.com-20060131142422-000d1398c39fd730
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:27:38 -0600
message:
[patch] Dennis Duchier: bzr ancestry post-repository bugfix and test case.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131142422-000d1398c39fd730
parent: john at arbash-meinel.com-20060130011327-f98356c226f92f56
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Tue 2006-01-31 08:24:22 -0600
message:
[patch] Aaron Bentley: blackbox test and fix for 'bzr find-merge-base'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060130011327-f98356c226f92f56
parent: john at arbash-meinel.com-20060129155904-4f794e2243f81096
parent: john at arbash-meinel.com-20060130010259-39020721b61b67b1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: bzr-jam-integration
timestamp: Sun 2006-01-29 19:13:27 -0600
message:
[merge] fix-weave-join
More information about the bazaar-commits
mailing list