Rev 1996: Merge bzr.dev. in file:///home/robertc/source/baz/test-performance/
Robert Collins
robertc at robertcollins.net
Thu Sep 28 22:54:26 BST 2006
------------------------------------------------------------
revno: 1996
revision-id: robertc at robertcollins.net-20060928215422-515439591d95933b
parent: robertc at robertcollins.net-20060918053858-d84532cfbf59d787
parent: robertc at robertcollins.net-20060928215309-1558670ff1ad3039
committer: Robert Collins <robertc at robertcollins.net>
branch nick: test_ancestry.py
timestamp: Fri 2006-09-29 07:54:22 +1000
message:
Merge bzr.dev.
added:
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/tests/blackbox/test_inventory.py test_inventory.py-20060921205529-9rwo2222xhm8edti-1
bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
bzrlib/version_info_formats/ version_formats-20060809195728-grgaanc8iql7psdy-1
bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
bzrlib/version_info_formats/format_python.py format_python.py-20060809202444-ike7i9ub03gb432p-1
bzrlib/version_info_formats/format_rio.py format_rio.py-20060809202444-ike7i9ub03gb432p-2
doc/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
modified:
BRANCH.TODO BRANCH.TODO-20060103052123-79ac4969351c03a9
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/benchmarks/bench_sftp.py bench_sftp.py-20060810114659-67c1edb27503ebde
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockdir.py lockdir.py-20060220222025-98258adf27fbdda3
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/rio.py rio.py-20051128032247-770b120b34dfff60
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/testament.py testament.py-20051011100429-6d319a18183b13c8
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_command.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_rio.py test_rio.py-20051128032247-dcd1082dfc86d3d3
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
bzrlib/tests/test_trace.py testtrace.py-20051110225523-a21117fc7a07eeff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/smart.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weavefile.py weavefile.py-20050629135233-2ffe0200f103f6c2
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/server.txt server.txt-20060913044801-h939fvbwzz39gf7g-1
------------------------------------------------------------
merged: robertc at robertcollins.net-20060928215309-1558670ff1ad3039
parent: robertc at robertcollins.net-20060918053544-531ddf7fd2ae877b
parent: robertc at robertcollins.net-20060928214943-66ad4ee8e0816fd5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: TestCaseWithMemoryTransport
timestamp: Fri 2006-09-29 07:53:09 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060928214943-66ad4ee8e0816fd5
parent: robertc at robertcollins.net-20060918040911-638b6d03bc752bef
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: make_branch_and_checkout
timestamp: Fri 2006-09-29 07:49:43 +1000
message:
Merge bzr.dev.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
parent: pqm at pqm.ubuntu.com-20060928100633-c8c5bc2d065bfc0d
parent: john at arbash-meinel.com-20060928160442-53b112c0fe1477a8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-28 17:15:39 +0100
message:
(vila) Provide cloning hint to children of HttpTransportBase
------------------------------------------------------------
merged: john at arbash-meinel.com-20060928160442-53b112c0fe1477a8
parent: pqm at pqm.ubuntu.com-20060928100633-c8c5bc2d065bfc0d
parent: v.ladeuil+lp at free.fr-20060921075929-3572272c52c8e14f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2006-09-28 11:04:42 -0500
message:
(vila) Provide cloning hint to children of HttpTransportBase
------------------------------------------------------------
merged: v.ladeuil+lp at free.fr-20060921075929-3572272c52c8e14f
parent: pqm at pqm.ubuntu.com-20060920234641-daa0e6db0263b590
committer: v.ladeuil+lp at free.fr
branch nick: bzr.http.clone
timestamp: Thu 2006-09-21 09:59:29 +0200
message:
Fix bug #61606 by providing cloning hint do daughter classes.
* bzrlib/transport/http/__init__.py:
(HttpTransportBase.clone): We can't decide for the class daughters how
the cloning occurs. We just give them the hint.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060928100633-c8c5bc2d065bfc0d
parent: pqm at pqm.ubuntu.com-20060928081358-b8dfad24b0625b94
parent: mbp at sourcefrog.net-20060928054324-72aebdcd6b540449
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-28 11:06:33 +0100
message:
(mbp) find elementtree from python2.5
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060928054324-72aebdcd6b540449
parent: pqm at pqm.ubuntu.com-20060925012445-1cc0dd1824c4b731
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Thu 2006-09-28 15:43:24 +1000
message:
Load python2.5's ElementTree if present
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060928081358-b8dfad24b0625b94
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
parent: john at arbash-meinel.com-20060927221253-db89ca8e8a8c102e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-28 09:13:58 +0100
message:
(jam) tests that expect LockContention should timeout sooner
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927221253-db89ca8e8a8c102e
parent: john at arbash-meinel.com-20060927205837-63bc5063fe9a2ebf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-27 17:12:53 -0500
message:
Change tests that expect locking to fail to timeout sooner.
This includes changing LockDir to not have a compiled-in default timeout.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927205837-63bc5063fe9a2ebf
parent: john at arbash-meinel.com-20060927205222-2f2a5d351b52b617
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-27 15:58:37 -0500
message:
[merge] bzr.dev 2049
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927205222-2f2a5d351b52b617
parent: john at arbash-meinel.com-20060925204824-f4fff4858fa59b0c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-27 15:52:22 -0500
message:
Review feedback from Robert
------------------------------------------------------------
merged: john at arbash-meinel.com-20060925204824-f4fff4858fa59b0c
parent: john at arbash-meinel.com-20060922233640-d9921804c4f151ff
parent: pqm at pqm.ubuntu.com-20060925194052-a685edd457d83f8e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Mon 2006-09-25 15:48:24 -0500
message:
[merge] bzr.dev 2041
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922233640-d9921804c4f151ff
parent: john at arbash-meinel.com-20060920180700-0195b84c614cd094
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-09-22 18:36:40 -0500
message:
Change to reporting the time when we will stop trying to grab the lock
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920180700-0195b84c614cd094
parent: john at arbash-meinel.com-20060920175228-b0ebfba4c3384f9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 13:07:00 -0500
message:
Update NEWS for fixing bugs #43521, #49556
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920175228-b0ebfba4c3384f9d
parent: john at arbash-meinel.com-20060920171045-b6370b896a35fe9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 12:52:28 -0500
message:
Switch from locking the peek() to locking attempt_lock(), which is much more stable
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920171045-b6370b896a35fe9d
parent: john at arbash-meinel.com-20060920170114-20251f6bb2e7b7f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 12:10:45 -0500
message:
NEWS
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920170114-20251f6bb2e7b7f7
parent: john at arbash-meinel.com-20060920163319-be9550fb82b83385
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 12:01:14 -0500
message:
Change default timeouts, and report differently the first failure
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920163319-be9550fb82b83385
parent: john at arbash-meinel.com-20060920163206-f996c191184dd0f7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 11:33:19 -0500
message:
Decrease the waiting time
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920163206-f996c191184dd0f7
parent: john at arbash-meinel.com-20060915004457-902cec0526a39337
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Wed 2006-09-20 11:32:06 -0500
message:
Add the ability to report if the lock changes from underneath you
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915004457-902cec0526a39337
parent: john at arbash-meinel.com-20060915004210-7f52628492d8b01c
parent: pqm at pqm.ubuntu.com-20060914085936-0fb09526ebcf67d2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Thu 2006-09-14 19:44:57 -0500
message:
[merge] bzr.dev 2009
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915004210-7f52628492d8b01c
parent: john at arbash-meinel.com-20060915003147-b8b8c95f788ec272
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Thu 2006-09-14 19:42:10 -0500
message:
Create a helper function for formatting lock information
------------------------------------------------------------
merged: john at arbash-meinel.com-20060915003147-b8b8c95f788ec272
parent: john at arbash-meinel.com-20060825212605-a89d9eef25df6972
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Thu 2006-09-14 19:31:47 -0500
message:
create a helper for formatting a time delta
------------------------------------------------------------
merged: john at arbash-meinel.com-20060825212605-a89d9eef25df6972
parent: john at arbash-meinel.com-20060825205133-402530a133d623a0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-08-25 16:26:05 -0500
message:
NEWS: this addresses bug #49556
------------------------------------------------------------
merged: john at arbash-meinel.com-20060825205133-402530a133d623a0
parent: john at arbash-meinel.com-20060825204048-677cae3cf5ff9ead
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-08-25 15:51:33 -0500
message:
Switch the default from instantly aborting, to waiting as long as 1 minute (down from 5 minutes)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060825204048-677cae3cf5ff9ead
parent: pqm at pqm.ubuntu.com-20060825162024-eda7457881a28da7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: wait-on-lock
timestamp: Fri 2006-08-25 15:40:48 -0500
message:
Report to the user when we are spinning on a lock
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
parent: pqm at pqm.ubuntu.com-20060927202746-942eb21d12b7edc7
parent: abentley at panoramicfeedback.com-20060927203408-883d6620eaad303c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 21:44:31 +0100
message:
Revert deletes files that don't exist in target if not locally modified
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927203408-883d6620eaad303c
parent: abentley at panoramicfeedback.com-20060927202832-9795d0528e311e31
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 16:34:08 -0400
message:
Update NEWS
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927202832-9795d0528e311e31
parent: abentley at panoramicfeedback.com-20060927191452-b1d0d8271a0ac936
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 16:28:32 -0400
message:
Changes from review
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927191452-b1d0d8271a0ac936
parent: abentley at panoramicfeedback.com-20060927184954-2e997cc52926235c
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 15:14:52 -0400
message:
Fix iteraction of revert and files not present in target_tree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927184954-2e997cc52926235c
parent: abentley at panoramicfeedback.com-20060922195719-64973e4cd0d704ce
parent: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 14:49:54 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060927202746-942eb21d12b7edc7
parent: pqm at pqm.ubuntu.com-20060927194846-b26e0ca2dd3f8519
parent: abentley at panoramicfeedback.com-20060927201608-a22549bfaefd3bd1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 21:27:46 +0100
message:
Add support for bundles and testaments with roots
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927201608-a22549bfaefd3bd1
parent: abentley at panoramicfeedback.com-20060926134043-05215c1c01c4efb5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-09-27 16:16:08 -0400
message:
Fix copyright statements
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060926134043-05215c1c01c4efb5
parent: abentley at panoramicfeedback.com-20060926132839-cee32159ab268eeb
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-09-26 09:40:43 -0400
message:
Remove the check-parent patch
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060926132839-cee32159ab268eeb
parent: aaron.bentley at utoronto.ca-20060922020810-b21fa5e0fd454f30
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Tue 2006-09-26 09:28:39 -0400
message:
Changes from review
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060922020810-b21fa5e0fd454f30
parent: aaron.bentley at utoronto.ca-20060922015350-0bbc48a29fff8987
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 22:08:10 -0400
message:
Add supports_rich_root member to repository
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060922015350-0bbc48a29fff8987
parent: aaron.bentley at utoronto.ca-20060922012015-8db4d7b46e8ced08
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 21:53:50 -0400
message:
Cleanups
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060922012015-8db4d7b46e8ced08
parent: aaron.bentley at utoronto.ca-20060922010530-632a5f35fb488eb2
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 21:20:15 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060922010530-632a5f35fb488eb2
parent: aaron.bentley at utoronto.ca-20060921234714-d8de2d5715f34555
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 21:05:30 -0400
message:
Ensure that new-model revisions aren't installed into old-model repos
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060921234714-d8de2d5715f34555
parent: aaron.bentley at utoronto.ca-20060921233732-911d45ab9049a64c
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 19:47:14 -0400
message:
Test 0.9 bundles for knit format1 and knit format2
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060921233732-911d45ab9049a64c
parent: aaron.bentley at utoronto.ca-20060921232303-456dc6bfcc66f870
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 19:37:32 -0400
message:
Stop using get_revision_id to make bundles
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060921232303-456dc6bfcc66f870
parent: abentley at panoramicfeedback.com-20060921220258-50026dc4220c8b11
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 19:23:03 -0400
message:
Got 0.9 bundles working, with root included by changes_from
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921220258-50026dc4220c8b11
parent: abentley at panoramicfeedback.com-20060921181414-f913391df42bffaf
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-09-21 18:02:58 -0400
message:
More work on bundles
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921181414-f913391df42bffaf
parent: abentley at panoramicfeedback.com-20060921174020-5a6a95957ad5dd7b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-09-21 14:14:14 -0400
message:
Bundle 0.9 uses Testament 3 strict
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921174020-5a6a95957ad5dd7b
parent: abentley at panoramicfeedback.com-20060921155844-982ba25e0b5450c5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-09-21 13:40:20 -0400
message:
Implement testament format 3 strict
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921155844-982ba25e0b5450c5
parent: abentley at panoramicfeedback.com-20060921155805-5b3579f9994cd307
parent: abentley at panoramicfeedback.com-20060921155245-ca4dbd58e85707a8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-09-21 11:58:44 -0400
message:
Merge error message fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921155245-ca4dbd58e85707a8
parent: abentley at panoramicfeedback.com-20060921151927-5421c453aeb86ded
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-parents
timestamp: Thu 2006-09-21 11:52:45 -0400
message:
Correct error formatting
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921155805-5b3579f9994cd307
parent: aaron.bentley at utoronto.ca-20060921115920-5ae7c3ba4b746348
parent: abentley at panoramicfeedback.com-20060921151927-5421c453aeb86ded
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Thu 2006-09-21 11:58:05 -0400
message:
Merge check-parent fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921151927-5421c453aeb86ded
parent: pqm at pqm.ubuntu.com-20060920234641-daa0e6db0263b590
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: check-parents
timestamp: Thu 2006-09-21 11:19:27 -0400
message:
Prevent raw copies from corrupting knits by checking parents
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060921115920-5ae7c3ba4b746348
parent: abentley at panoramicfeedback.com-20060921014844-a86a75c8f813548e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: format-bumps
timestamp: Thu 2006-09-21 07:59:20 -0400
message:
Bundles now corrupt repositories
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921014844-a86a75c8f813548e
parent: abentley at panoramicfeedback.com-20060920184151-6ad695cf843a746b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-09-20 21:48:44 -0400
message:
start work on format 0.9 serializer
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060920184151-6ad695cf843a746b
parent: aaron.bentley at utoronto.ca-20060910021831-51f5888a7e62a02d
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: format-bumps
timestamp: Wed 2006-09-20 14:41:51 -0400
message:
Ensure that 0.8 bundles aren't used with KnitRepository2
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060927194846-b26e0ca2dd3f8519
parent: pqm at pqm.ubuntu.com-20060927192118-9930ffc4445f28ae
parent: john at arbash-meinel.com-20060927192035-617471739aca0247
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 20:48:46 +0100
message:
Lukáš Lalinský: TransportNotPossible has a bad docstring
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927192035-617471739aca0247
parent: john at arbash-meinel.com-20060927191106-a5f1ef634f82f1a1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-09-27 14:20:35 -0500
message:
Lukáš Lalinský: TransportNotPossible has a bad docstring
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060927192118-9930ffc4445f28ae
parent: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
parent: john at arbash-meinel.com-20060927191106-a5f1ef634f82f1a1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 20:21:18 +0100
message:
[merge] Lukáš Lalinský: fix 'bzr serve' for win32
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927191106-a5f1ef634f82f1a1
parent: john at arbash-meinel.com-20060927190923-0f500435cb703778
parent: lalinsky at gmail.com-20060927125058-1d3be7bb11c49b20
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-09-27 14:11:06 -0500
message:
[merge] Lukáš Lalinský: fix 'bzr serve' for win32
------------------------------------------------------------
merged: lalinsky at gmail.com-20060927125058-1d3be7bb11c49b20
parent: pqm at pqm.ubuntu.com-20060926215910-c87762786b24e444
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: bzr.win32-serve
timestamp: Wed 2006-09-27 14:50:58 +0200
message:
Use urlutils.local_path_to_url to get an URL from the directory path.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060927190923-0f500435cb703778
parent: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2006-09-27 14:09:23 -0500
message:
Give Robert credit for closing a bug
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060926233056-203e713964b2cd51
parent: pqm at pqm.ubuntu.com-20060926215910-c87762786b24e444
parent: robertc at robertcollins.net-20060926231500-ae7480f138254f17
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-27 00:30:56 +0100
message:
(Robert Collins) Forward merge from 0.11rc2 NEWS and performance-regression fix.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060926231500-ae7480f138254f17
parent: pqm at pqm.ubuntu.com-20060926215910-c87762786b24e444
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-09-27 09:15:00 +1000
message:
(Robert Collins) Forward merge from 0.11rc2 NEWS and performance-regression fix.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060926215910-c87762786b24e444
parent: pqm at pqm.ubuntu.com-20060926075259-8417b3b53037df04
parent: john at arbash-meinel.com-20060926204611-8621c714eac8c614
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-26 22:59:10 +0100
message:
(jam) fix commit performance regression
------------------------------------------------------------
merged: john at arbash-meinel.com-20060926204611-8621c714eac8c614
parent: john at arbash-meinel.com-20060926003925-a0e38c3d9fbadf4a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit-perf
timestamp: Tue 2006-09-26 15:46:11 -0500
message:
CommitBuilder.get_tree => CommitBuilder.revision_tree
------------------------------------------------------------
merged: john at arbash-meinel.com-20060926003925-a0e38c3d9fbadf4a
parent: john at arbash-meinel.com-20060926003505-6d2c1d6ef6e4945e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit-perf
timestamp: Mon 2006-09-25 19:39:25 -0500
message:
NEWS and documentation
------------------------------------------------------------
merged: john at arbash-meinel.com-20060926003505-6d2c1d6ef6e4945e
parent: john at arbash-meinel.com-20060926002612-31b451c3f8a41992
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit-perf
timestamp: Mon 2006-09-25 19:35:05 -0500
message:
Call _cache_basis_inventory directly rather than set_last_revision
------------------------------------------------------------
merged: john at arbash-meinel.com-20060926002612-31b451c3f8a41992
parent: john at arbash-meinel.com-20060925222031-fa7a5cfd5c1fa5c4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit-perf
timestamp: Mon 2006-09-25 19:26:12 -0500
message:
Update WorkingTree.set_parent_trees() to directly cache inv.
Rather than go through set_parent_ids() which calls set_last_revision(),
which has to read the inventory back out of the repository.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060925222031-fa7a5cfd5c1fa5c4
parent: pqm at pqm.ubuntu.com-20060925194052-a685edd457d83f8e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit-perf
timestamp: Mon 2006-09-25 17:20:31 -0500
message:
Add a 'get_tree()' call that returns a RevisionTree for the newly committed tree
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060926075259-8417b3b53037df04
parent: pqm at pqm.ubuntu.com-20060925222037-8be906e237613b10
parent: robertc at robertcollins.net-20060926055137-7b0fe47fa3ba5dad
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-26 08:52:59 +0100
message:
(Andrew Bennetts, Robert Collins) Set smart server test sockets to be blocking
------------------------------------------------------------
merged: robertc at robertcollins.net-20060926055137-7b0fe47fa3ba5dad
parent: robertc at robertcollins.net-20060925011049-7612969ffb4a5475
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-09-26 15:51:37 +1000
message:
(Andrew Bennetts, Robert Collins) Set smart server test sockets to be blocking
to avoid EAGAIN errors during the test suite on windows.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060925222037-8be906e237613b10
parent: pqm at pqm.ubuntu.com-20060925194052-a685edd457d83f8e
parent: aaron.bentley at utoronto.ca-20060925215606-029bd3c8944318e2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-25 23:20:37 +0100
message:
Condense help command listings
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060925215606-029bd3c8944318e2
parent: aaron.bentley at utoronto.ca-20060925215505-d29f14c3fc73fdc3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Mon 2006-09-25 17:56:06 -0400
message:
update NEWS
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060925215505-d29f14c3fc73fdc3
parent: aaron.bentley at utoronto.ca-20060925215428-b2fe01fddf80004b
parent: pqm at pqm.ubuntu.com-20060925194052-a685edd457d83f8e
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Mon 2006-09-25 17:55:05 -0400
message:
merge bzr.dev
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060925215428-b2fe01fddf80004b
parent: aaron.bentley at utoronto.ca-20060924160338-24efe2f89e6cc190
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Mon 2006-09-25 17:54:28 -0400
message:
Change angle brackets to square brackets
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060924160338-24efe2f89e6cc190
parent: aaron.bentley at utoronto.ca-20060923184336-75a9f0254667aca4
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Sun 2006-09-24 12:03:38 -0400
message:
Changes from review and tweaks
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060923184336-75a9f0254667aca4
parent: aaron.bentley at utoronto.ca-20060923172850-790fb842f3df42fe
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Sat 2006-09-23 14:43:36 -0400
message:
Fix testcase
------------------------------------------------------------
merged: aaron.bentley at utoronto.ca-20060923172850-790fb842f3df42fe
parent: pqm at pqm.ubuntu.com-20060922225959-7d4c092a9310fe6a
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: helptext
timestamp: Sat 2006-09-23 13:28:50 -0400
message:
Condense command help text
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060925194052-a685edd457d83f8e
parent: pqm at pqm.ubuntu.com-20060925184217-fd144de117df49c3
parent: john at arbash-meinel.com-20060925193049-070c5538905aae3e
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-25 20:40:52 +0100
message:
(jam) add working_dir= parameter to run_bzr* functions
------------------------------------------------------------
merged: john at arbash-meinel.com-20060925193049-070c5538905aae3e
parent: john at arbash-meinel.com-20060925192926-eebc7d5b0211a310
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_bzr_workingdir
timestamp: Mon 2006-09-25 14:30:49 -0500
message:
Move NEWS to dev section, rather than 0.11 section
------------------------------------------------------------
merged: john at arbash-meinel.com-20060925192926-eebc7d5b0211a310
parent: john at arbash-meinel.com-20060925192112-c2847645ff74e8c7
parent: pqm at pqm.ubuntu.com-20060925184217-fd144de117df49c3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_bzr_workingdir
timestamp: Mon 2006-09-25 14:29:26 -0500
message:
[merge] bzr.dev 2040
------------------------------------------------------------
merged: john at arbash-meinel.com-20060925192112-c2847645ff74e8c7
parent: john at arbash-meinel.com-20060921202504-926521f9d02ff542
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_bzr_workingdir
timestamp: Mon 2006-09-25 14:21:12 -0500
message:
Add docstring to why run_bzr_captured is overridden
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921202504-926521f9d02ff542
parent: john at arbash-meinel.com-20060921201728-880046debc7eb84d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_bzr_workingdir
timestamp: Thu 2006-09-21 15:25:04 -0500
message:
add tests that the working directory is preserved, cleanup run_bzr_subprocess
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921201728-880046debc7eb84d
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: run_bzr_workingdir
timestamp: Thu 2006-09-21 15:17:28 -0500
message:
Add working_dir=XX to run_bzr_* functions, and clean up tests
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060925184217-fd144de117df49c3
parent: pqm at pqm.ubuntu.com-20060925012445-1cc0dd1824c4b731
parent: abentley at panoramicfeedback.com-20060925183050-057959b1247aacc8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-25 19:42:17 +0100
message:
cleanup progress properly when interrupted during fetch (#54000)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060925183050-057959b1247aacc8
parent: abentley at panoramicfeedback.com-20060925145238-385b618dccf07763
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: progress-cleanup
timestamp: Mon 2006-09-25 14:30:50 -0400
message:
Tweak test to avoid catching assert
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060925145238-385b618dccf07763
parent: pqm at pqm.ubuntu.com-20060925012445-1cc0dd1824c4b731
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: progress-cleanup
timestamp: Mon 2006-09-25 10:52:38 -0400
message:
Clean up progress properly when interrupted during fetch (#54000)
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060925012445-1cc0dd1824c4b731
parent: pqm at pqm.ubuntu.com-20060925001848-e66640f823fffa93
parent: robertc at robertcollins.net-20060925011049-7612969ffb4a5475
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-25 02:24:45 +0100
message:
(Robert Collins) Add 0.12 deprecation symbol.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060925011049-7612969ffb4a5475
parent: robertc at robertcollins.net-20060925000315-d096352885e1b2ec
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-09-25 11:10:49 +1000
message:
(Robert Collins) Add 0.12 deprecation symbol.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060925001848-e66640f823fffa93
parent: pqm at pqm.ubuntu.com-20060924185311-aa722847c6e4c74c
parent: robertc at robertcollins.net-20060925000315-d096352885e1b2ec
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-09-25 01:18:48 +0100
message:
(Robert Collins) bzr 0.11rc1 has branch, bump bzr.dev version to 0.12
------------------------------------------------------------
merged: robertc at robertcollins.net-20060925000315-d096352885e1b2ec
parent: pqm at pqm.ubuntu.com-20060924185311-aa722847c6e4c74c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-09-25 10:03:15 +1000
message:
(Robert Collins) bzr 0.11rc1 has branch, bump bzr.dev version to 0.12
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060924185311-aa722847c6e4c74c
parent: pqm at pqm.ubuntu.com-20060923210711-549a79eec0f72812
parent: john at arbash-meinel.com-20060924184209-09738b17b2de412f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2006-09-24 19:53:11 +0100
message:
(jam) don't delete logs for failed tests (and ensure this with new tests)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060924184209-09738b17b2de412f
parent: john at arbash-meinel.com-20060924172729-1dcf6e0dc1f7ab29
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fail-test-keep-log
timestamp: Sun 2006-09-24 13:42:09 -0500
message:
whitespace fix
------------------------------------------------------------
merged: john at arbash-meinel.com-20060924172729-1dcf6e0dc1f7ab29
parent: pqm at pqm.ubuntu.com-20060923210711-549a79eec0f72812
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fail-test-keep-log
timestamp: Sun 2006-09-24 12:27:29 -0500
message:
test that logs are kept or deleted when appropriate
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060923210711-549a79eec0f72812
parent: pqm at pqm.ubuntu.com-20060923065013-b8483dd421706cbe
parent: john at arbash-meinel.com-20060923203422-01eab04e7a3120cc
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-23 22:07:11 +0100
message:
(jam) fix handling of directories in zip exports
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923203422-01eab04e7a3120cc
parent: john at arbash-meinel.com-20060923190544-c3f625a5bc5589ab
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Sat 2006-09-23 15:34:22 -0500
message:
Bring back log deletions
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923190544-c3f625a5bc5589ab
parent: john at arbash-meinel.com-20060923165308-821b9c574cfea136
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Sat 2006-09-23 14:05:44 -0500
message:
paths are always forward slashed for python zipfiles
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923165308-821b9c574cfea136
parent: john at arbash-meinel.com-20060923162147-06b40d23f9cd2f47
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Sat 2006-09-23 11:53:08 -0500
message:
Set the external_attr bits so Windows respects our directories
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923162147-06b40d23f9cd2f47
parent: john at arbash-meinel.com-20060923161009-40d4cbd48b167f3c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Sat 2006-09-23 11:21:47 -0500
message:
In zip files, directories must have trailing slashes
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923161009-40d4cbd48b167f3c
parent: john at arbash-meinel.com-20060921161458-8b687d1af10ca267
parent: pqm at pqm.ubuntu.com-20060922225959-7d4c092a9310fe6a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Sat 2006-09-23 11:10:09 -0500
message:
[merge] bzr.dev 2034
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060923065013-b8483dd421706cbe
parent: pqm at pqm.ubuntu.com-20060922225959-7d4c092a9310fe6a
parent: john at arbash-meinel.com-20060923063946-e596c8a8eef928b4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-09-23 07:50:13 +0100
message:
(jam) allow 'bzr inventory filename' (bug #3631)
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923063946-e596c8a8eef928b4
parent: john at arbash-meinel.com-20060923063744-98451651a436df9b
parent: pqm at pqm.ubuntu.com-20060922225959-7d4c092a9310fe6a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Sat 2006-09-23 01:39:46 -0500
message:
[merge] bzr.dev 2034
------------------------------------------------------------
merged: john at arbash-meinel.com-20060923063744-98451651a436df9b
parent: john at arbash-meinel.com-20060922213954-8de9af5047a7e5c1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Sat 2006-09-23 01:37:44 -0500
message:
make None the only invalid file list
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922213954-8de9af5047a7e5c1
parent: john at arbash-meinel.com-20060922213448-7ac0ce86b5fbcf9f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Fri 2006-09-22 16:39:54 -0500
message:
more tests for 'bzr inventory' including errors and nesting
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922213448-7ac0ce86b5fbcf9f
parent: john at arbash-meinel.com-20060921210631-c6ce799f90431a13
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Fri 2006-09-22 16:34:48 -0500
message:
Change how 'bzr inventory' finds paths
It uses tree_files so it works correctly when in a subdir.
It also uses find_ids_across_trees() so that it can look
for files in old revisions using old or new paths, and
also checks that all paths actually exist, raising
an exception if paths are not present.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921210631-c6ce799f90431a13
parent: john at arbash-meinel.com-20060921205545-a6cc5f07adb70104
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Thu 2006-09-21 16:06:31 -0500
message:
Fix bug #3631, allow 'bzr inventory filename'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921205545-a6cc5f07adb70104
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: inventory-takes-file-3631
timestamp: Thu 2006-09-21 15:55:45 -0500
message:
Factor the 'bzr inventory' tests out of tests_too_much
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922225959-7d4c092a9310fe6a
parent: pqm at pqm.ubuntu.com-20060922210246-f5feadad82fc6617
parent: john at arbash-meinel.com-20060922215628-276d52589e497eaf
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 23:59:59 +0100
message:
(jam) fix bug #56814, don't fail when annotating an empty file
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922215628-276d52589e497eaf
parent: john at arbash-meinel.com-20060921194129-7fed907b470a227e
parent: pqm at pqm.ubuntu.com-20060922210246-f5feadad82fc6617
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate-empty-56814
timestamp: Fri 2006-09-22 16:56:28 -0500
message:
[merge] bzr.dev 2033
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921194129-7fed907b470a227e
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: annotate-empty-56814
timestamp: Thu 2006-09-21 14:41:29 -0500
message:
'bzr annotate' shouldn't fail on an empty file: fix bug #56814
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922210246-f5feadad82fc6617
parent: pqm at pqm.ubuntu.com-20060922195914-56c9cc71b2ea2e6f
parent: abentley at panoramicfeedback.com-20060922195719-64973e4cd0d704ce
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 22:02:46 +0100
message:
Make commit puke on unversioned files
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060922195719-64973e4cd0d704ce
parent: abentley at panoramicfeedback.com-20060922184904-2871c736c01241f3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-09-22 15:57:19 -0400
message:
Tweak from review comments
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060922184904-2871c736c01241f3
parent: abentley at panoramicfeedback.com-20060922164454-40022f1c95ef9646
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-09-22 14:49:04 -0400
message:
Stop accepting non-existant files in commit (#50793)
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060922164454-40022f1c95ef9646
parent: abentley at panoramicfeedback.com-20060920173834-38c67f9818519017
parent: pqm at pqm.ubuntu.com-20060922051312-035df0d41ab950f1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-09-22 12:44:54 -0400
message:
Merge from bzr,dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922195914-56c9cc71b2ea2e6f
parent: pqm at pqm.ubuntu.com-20060922051312-035df0d41ab950f1
parent: john at arbash-meinel.com-20060922193757-a8341ac119f0d33c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 20:59:14 +0100
message:
(jam) fixes for rio and version-info
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922193757-a8341ac119f0d33c
parent: john at arbash-meinel.com-20060922151955-1ce5162055c9538d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nested-rio
timestamp: Fri 2006-09-22 14:37:57 -0500
message:
Create a 'read_stanza_unicode' to handle unicode processing
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922151955-1ce5162055c9538d
parent: john at arbash-meinel.com-20060922054531-d580a97c764c63a2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nested-rio
timestamp: Fri 2006-09-22 10:19:55 -0500
message:
Add a test that we can find the version info when we only have a branch
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922054531-d580a97c764c63a2
parent: john at arbash-meinel.com-20060922053828-fee2e95b2fb407f2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nested-rio
timestamp: Fri 2006-09-22 00:45:31 -0500
message:
Change comparisons to ignore the build-date field
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922053828-fee2e95b2fb407f2
parent: john at arbash-meinel.com-20060922052938-8a82e211a1b7540a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nested-rio
timestamp: Fri 2006-09-22 00:38:28 -0500
message:
Change the version-info --format=rio to support unicode messages
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922052938-8a82e211a1b7540a
parent: pqm at pqm.ubuntu.com-20060922034848-49c18a6d819733bc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: nested-rio
timestamp: Fri 2006-09-22 00:29:38 -0500
message:
Make it easier to nest Stanzas with Unicode contents
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922051312-035df0d41ab950f1
parent: pqm at pqm.ubuntu.com-20060922034848-49c18a6d819733bc
parent: john at arbash-meinel.com-20060922050115-93b124532cdd0ed0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 06:13:12 +0100
message:
(abentley) Another test for TreeTransform.create_file()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060922050115-93b124532cdd0ed0
parent: john at arbash-meinel.com-20060921192723-58dcfdd119f81ac0
parent: abentley at panoramicfeedback.com-20060921202136-e5a8deaadfa00021
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: revert-subpath-56549
timestamp: Fri 2006-09-22 00:01:15 -0500
message:
[merge] Aaron Bentley's file mode fix
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921202136-e5a8deaadfa00021
parent: abentley at panoramicfeedback.com-20060921195811-4eeaff48e29d6604
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Thu 2006-09-21 16:21:36 -0400
message:
Added test for preserving file mode
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060921195811-4eeaff48e29d6604
parent: aaron.bentley at utoronto.ca-20060525042123-3289bf33a73ef194
parent: john at arbash-meinel.com-20060921192723-58dcfdd119f81ac0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.ttransform
timestamp: Thu 2006-09-21 15:58:11 -0400
message:
Merge bugfix from John Meinel
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922034848-49c18a6d819733bc
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
parent: mbp at sourcefrog.net-20060922032929-dd8817fc573b9ffd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 04:48:48 +0100
message:
(marien,mbp) python2.5 and elementtree fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922032929-dd8817fc573b9ffd
parent: mbp at sourcefrog.net-20060922032719-f4d915e4eb2d8dbe
parent: mbp at sourcefrog.net-20060921083525-0ac21ceb8e5bba46
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Fri 2006-09-22 13:29:29 +1000
message:
merge import fix
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060921083525-0ac21ceb8e5bba46
parent: mbp at sourcefrog.net-20060921080121-f020f844f9982383
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-09-21 18:35:25 +1000
message:
fix imports in bench_sftp
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060921080121-f020f844f9982383
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.integration
timestamp: Thu 2006-09-21 18:01:21 +1000
message:
doc
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922032719-f4d915e4eb2d8dbe
parent: mbp at sourcefrog.net-20060922030738-bff07dd5361b24df
parent: marienz at gentoo.org-20060922005136-6b5e0b856a4baff3
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Fri 2006-09-22 13:27:19 +1000
message:
[merge] ElementTree exception fixes
------------------------------------------------------------
merged: marienz at gentoo.org-20060922005136-6b5e0b856a4baff3
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 02:51:36 +0200
message:
Handle the different exception (non-c)ElementTree raises.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922030738-bff07dd5361b24df
parent: mbp at sourcefrog.net-20060922030240-275cc23f08aaa30a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: python25
timestamp: Fri 2006-09-22 13:07:38 +1000
message:
Restore bench_sftp import of TestSkipped
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922030240-275cc23f08aaa30a
parent: mbp at sourcefrog.net-20060922023241-474fdb7540c8cf2e
parent: mbp at sourcefrog.net-20060901035507-463cb84e88732d46
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: marien.python2.5
timestamp: Fri 2006-09-22 13:02:40 +1000
message:
[merge] additional python2.5 fixes
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060901035507-463cb84e88732d46
parent: mbp at sourcefrog.net-20060901034717-a9a7d359fc7e3191
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Fri 2006-09-01 13:55:07 +1000
message:
python2.5 apparently has trouble with unicode options
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060901034717-a9a7d359fc7e3191
parent: mbp at sourcefrog.net-20060815083351-f4ba9f92ba8d37eb
parent: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Fri 2006-09-01 13:47:17 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060815083351-f4ba9f92ba8d37eb
parent: mbp at sourcefrog.net-20060815074912-8d4151cf41ea18e9
parent: pqm at pqm.ubuntu.com-20060815050217-d2df7c83d6c5eeca
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Tue 2006-08-15 18:33:51 +1000
message:
[merge] bzr.dev
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060815074912-8d4151cf41ea18e9
parent: pqm at pqm.ubuntu.com-20060814042957-3fa43995db57512a
parent: sandals at crustytoothpaste.ath.cx-20060428142637-289a48babda94a8a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.mbp.python25
timestamp: Tue 2006-08-15 17:49:12 +1000
message:
[merge] [broken] python2.5 fixes
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060428142637-289a48babda94a8a
parent: sandals at crustytoothpaste.ath.cx-20060428140743-3904d8780a941074
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Fri 2006-04-28 14:26:37 +0000
message:
Change a repository test to explicitly convert to a list.
In python2.5, generator objects apparently cannot be autoconverted to a list.
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060428140743-3904d8780a941074
parent: sandals at crustytoothpaste.ath.cx-20060427012324-d645b696893446d6
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Fri 2006-04-28 14:07:43 +0000
message:
Canonicalize the exception name to the python2.4 form, which is more
user-friendly.
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060427012324-d645b696893446d6
parent: sandals at crustytoothpaste.ath.cx-20060427001121-e0e728124aebfcb1
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Thu 2006-04-27 01:23:24 +0000
message:
Change the BzrNewError super invocation to a direct call, so it works with 2.4.
------------------------------------------------------------
merged: sandals at crustytoothpaste.ath.cx-20060427001121-e0e728124aebfcb1
parent: pqm at pqm.ubuntu.com-20060424103128-a637f56a7c529bad
committer: Brian M. Carlson <sandals at crustytoothpaste.ath.cx>
branch nick: bmc-python2.5
timestamp: Thu 2006-04-27 00:11:21 +0000
message:
Add a workaround for usage of the args attribute in exceptions.
------------------------------------------------------------
merged: mbp at sourcefrog.net-20060922023241-474fdb7540c8cf2e
parent: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
parent: marienz at gentoo.org-20060922001708-b5db1381393a1f0a
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: marien.python2.5
timestamp: Fri 2006-09-22 12:32:41 +1000
message:
[merge] python2.5 fixes from Marien
------------------------------------------------------------
merged: marienz at gentoo.org-20060922001708-b5db1381393a1f0a
parent: marienz at gentoo.org-20060921230654-77cb3d28e97ffb9f
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 02:17:08 +0200
message:
Fix another python 2.5 issue.
------------------------------------------------------------
merged: marienz at gentoo.org-20060921230654-77cb3d28e97ffb9f
parent: marienz at gentoo.org-20060921230619-910d2ec258cba83d
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 01:06:54 +0200
message:
Fixes for python 2.5.
------------------------------------------------------------
merged: marienz at gentoo.org-20060921230619-910d2ec258cba83d
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2006-09-22 01:06:19 +0200
message:
Make the test runner finish running if a doctest fails.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060922002407-21dde3dd8419b20b
parent: pqm at pqm.ubuntu.com-20060921225925-ab09f1d0cb2c838c
parent: john at arbash-meinel.com-20060921192723-58dcfdd119f81ac0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-22 01:24:07 +0100
message:
(jam, abentley) Fix bug #56549 by making TreeTransform._set_mode stat the right file
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921192723-58dcfdd119f81ac0
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: revert-subpath-56549
timestamp: Thu 2006-09-21 14:27:23 -0500
message:
Fix bug #56549, and write a direct test that the right path is being statted
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060921225925-ab09f1d0cb2c838c
parent: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
parent: john at arbash-meinel.com-20060921221228-94606313e7d88f86
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-21 23:59:25 +0100
message:
(jam) Add command 'bzr version-info'
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921221228-94606313e7d88f86
parent: john at arbash-meinel.com-20060921164822-86cc68e95e20b5d7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Thu 2006-09-21 17:12:28 -0500
message:
Add NEWS and a simple doc for using bzr version-info
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921164822-86cc68e95e20b5d7
parent: john at arbash-meinel.com-20060921164404-0df31a883c13e4e4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Thu 2006-09-21 11:48:22 -0500
message:
small cleanup, remove unused imports
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921164404-0df31a883c13e4e4
parent: john at arbash-meinel.com-20060921163339-f96d93a31db0d88a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Thu 2006-09-21 11:44:04 -0500
message:
Cleanup and simplify the blackbox tests
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921163339-f96d93a31db0d88a
parent: john at arbash-meinel.com-20060920151119-88a7090d0c17bbb3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Thu 2006-09-21 11:33:39 -0500
message:
test feedback from Robert.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920151119-88a7090d0c17bbb3
parent: john at arbash-meinel.com-20060920150038-a5651db2503b9e81
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Wed 2006-09-20 10:11:19 -0500
message:
Remove unused imports
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920150038-a5651db2503b9e81
parent: john at arbash-meinel.com-20060920145103-02725c6d6c886040
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Wed 2006-09-20 10:00:38 -0500
message:
rename version_info => cmd_version_info
avoid conflicting with 'bzrlib.version_info' the variable
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920145103-02725c6d6c886040
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
parent: john at arbash-meinel.com-20060920140640-8dca2f0fdb7564c3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version-info-55794
timestamp: Wed 2006-09-20 09:51:03 -0500
message:
[merge] version-info plugin, and cleanup for layout in bzr
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920140640-8dca2f0fdb7564c3
parent: john at arbash-meinel.com-20060920135737-52600d787db0b3a2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2006-09-20 09:06:40 -0500
message:
whitespace and formatting cleanups.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920135737-52600d787db0b3a2
parent: john at arbash-meinel.com-20060809202506-dd9f277c93c6c977
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2006-09-20 08:57:37 -0500
message:
Add a test that a default format is chosen
------------------------------------------------------------
merged: john at arbash-meinel.com-20060809202506-dd9f277c93c6c977
parent: john at arbash-meinel.com-20060622214022-009a731bee5dce1c
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2006-08-09 15:25:06 -0500
message:
Splitting up the version info code into a lazy factory style.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060622214022-009a731bee5dce1c
parent: john at arbash-meinel.com-20060131195053-bed52461d9381dd3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Thu 2006-06-22 16:40:22 -0500
message:
Updated version-info to the latest bzr.dev codebase. Changed to using VersionInfoBuilder, and made tests pass.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060131195053-bed52461d9381dd3
parent: john at arbash-meinel.com-20060119174638-8d4bbb4a48f6d5fa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-31 13:50:53 -0600
message:
Adding compatibility workarounds for newest bzr.dev
------------------------------------------------------------
merged: john at arbash-meinel.com-20060119174638-8d4bbb4a48f6d5fa
parent: john at arbash-meinel.com-20060104020046-590543c511a4fca7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Thu 2006-01-19 11:46:38 -0600
message:
Adding a setup script for Chris.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060104020046-590543c511a4fca7
parent: john at arbash-meinel.com-20060103213529-2e72f9a61c9f229e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-03 20:00:46 -0600
message:
Remove unnecessary import
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103213529-2e72f9a61c9f229e
parent: john at arbash-meinel.com-20060103183643-1ca02b174605d00d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-03 15:35:29 -0600
message:
Using revision-id for rio, and revision_id for python
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103183643-1ca02b174605d00d
parent: john at arbash-meinel.com-20060103182113-adcd11d25efa91b5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-03 12:36:43 -0600
message:
Including the date stamp for all revisions.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103182113-adcd11d25efa91b5
parent: john at arbash-meinel.com-20060103181811-384fb3f4168f72fc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-03 12:21:13 -0600
message:
Clean up whitespace in --format=python
------------------------------------------------------------
merged: john at arbash-meinel.com-20060103181811-384fb3f4168f72fc
parent: john at arbash-meinel.com-20060102221246-e5c0bf655ebc8f56
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Tue 2006-01-03 12:18:11 -0600
message:
Including file-revisions fields, updated test suite.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060102221246-e5c0bf655ebc8f56
parent: john at arbash-meinel.com-20060102221055-9331f83de11a4933
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Mon 2006-01-02 16:12:46 -0600
message:
Getting rid of bogus fields in date.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060102221055-9331f83de11a4933
parent: john at arbash-meinel.com-20060102220851-f076ae0686ce4696
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Mon 2006-01-02 16:10:55 -0600
message:
Comment fix
------------------------------------------------------------
merged: john at arbash-meinel.com-20060102220851-f076ae0686ce4696
parent: john at arbash-meinel.com-20060102220755-fecd509ae4883a96
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Mon 2006-01-02 16:08:51 -0600
message:
Forgot the api change.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060102220755-fecd509ae4883a96
parent: john at arbash-meinel.com-20051229005431-63b97b439bbd71e1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Mon 2006-01-02 16:07:55 -0600
message:
Switching to open_containing for simplicity.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051229005431-63b97b439bbd71e1
parent: john at arbash-meinel.com-20051229003713-f4b176e1b5e898ee
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 18:54:31 -0600
message:
Removing errors.py since UncleanError is no longer needed.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051229003713-f4b176e1b5e898ee
parent: john at arbash-meinel.com-20051229002909-0c9f16858ecfebc7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 18:37:13 -0600
message:
Adding tests for parsing the rio text back into rio.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051229002909-0c9f16858ecfebc7
parent: john at arbash-meinel.com-20051229000541-b81d81a6e2dc6382
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 18:29:09 -0600
message:
Updated the blackbox tests.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051229000541-b81d81a6e2dc6382
parent: john at arbash-meinel.com-20051228220312-0cc1c8ba83abb421
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 18:05:41 -0600
message:
Adding some whitebox tests for the output of generate_version_info
------------------------------------------------------------
merged: john at arbash-meinel.com-20051228220312-0cc1c8ba83abb421
parent: john at arbash-meinel.com-20051228215321-4c2a142860ade5c8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 16:03:12 -0600
message:
Cleaned up formats include-history always displays the log message.
------------------------------------------------------------
merged: john at arbash-meinel.com-20051228215321-4c2a142860ade5c8
parent: john at arbash-meinel.com-20051228211815-1ba13be897978e2d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 15:53:21 -0600
message:
Playing around with some formats
------------------------------------------------------------
merged: john at arbash-meinel.com-20051228211815-1ba13be897978e2d
parent: john at arbash-meinel.com-20051228204947-2fd81543e866350a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 15:18:15 -0600
message:
Have working rio output
------------------------------------------------------------
merged: john at arbash-meinel.com-20051228204947-2fd81543e866350a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: version_info
timestamp: Wed 2005-12-28 14:49:47 -0600
message:
Creating a plugin to ease generating version information from a tree.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060921170000-615159606ef6289f
parent: pqm at pqm.ubuntu.com-20060921160307-6081481c9a444cce
parent: john at arbash-meinel.com-20060921161458-8b687d1af10ca267
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-21 18:00:00 +0100
message:
(jam) export utf-8 paths to tarballs and zipfiles
------------------------------------------------------------
merged: john at arbash-meinel.com-20060921161458-8b687d1af10ca267
parent: john at arbash-meinel.com-20060920234318-05de23e98f7e7876
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Thu 2006-09-21 11:14:58 -0500
message:
Use build_tree_contents instead of manually opening the file
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920234318-05de23e98f7e7876
parent: john at arbash-meinel.com-20060920230051-3da14a7b314f6c99
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Wed 2006-09-20 18:43:18 -0500
message:
Move out export tests from test_too_much, refactor
and re-enable doc tests for export.get_root_name()
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920230051-3da14a7b314f6c99
parent: john at arbash-meinel.com-20060920225418-76ce8b371260ef08
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Wed 2006-09-20 18:00:51 -0500
message:
Cleanup the export tests to act more like the current api.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920225418-76ce8b371260ef08
parent: pqm at pqm.ubuntu.com-20060920182612-3fb546b62554f8c5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: tar-unicode-filenames-56815
timestamp: Wed 2006-09-20 17:54:18 -0500
message:
Fix bug #56815 by exporting paths in utf8 to tarfile and zipfile
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060921160307-6081481c9a444cce
parent: pqm at pqm.ubuntu.com-20060920234641-daa0e6db0263b590
parent: cfbolz at gmx.de-20060906211757-b0d73953b54efbc9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-21 17:03:07 +0100
message:
(cfbolz) Throw away disk logfile if not used
------------------------------------------------------------
merged: cfbolz at gmx.de-20060906211757-b0d73953b54efbc9
parent: cfbolz at gmx.de-20060906211722-b04f9c3ad1f53ef1
parent: pqm at pqm.ubuntu.com-20060905233301-2e69db43982088ae
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: throw_log_away
timestamp: Wed 2006-09-06 23:17:57 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060906211722-b04f9c3ad1f53ef1
parent: cfbolz at gmx.de-20060831114547-88347e7a6bce0eaf
parent: pqm at pqm.ubuntu.com-20060831060638-bfc0303de36a40a8
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: throw_log_away
timestamp: Wed 2006-09-06 23:17:22 +0200
message:
Merge bzr.dev.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060831114547-88347e7a6bce0eaf
parent: cfbolz at gmx.de-20060817112101-5e714140fb51f0d6
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: throw_log_away
timestamp: Thu 2006-08-31 13:45:47 +0200
message:
Make docstring clearer.
------------------------------------------------------------
merged: cfbolz at gmx.de-20060817112101-5e714140fb51f0d6
parent: cfbolz at gmx.de-20060817111057-108585811d3d24bb
parent: pqm at pqm.ubuntu.com-20060817075209-e85a1f9e05ff8b87
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: throw_log_away
timestamp: Thu 2006-08-17 13:21:01 +0200
message:
merge bzr.dev
------------------------------------------------------------
merged: cfbolz at gmx.de-20060817111057-108585811d3d24bb
parent: pqm at pqm.ubuntu.com-20060815155756-77559a6254704822
committer: Carl Friedrich Bolz <cfbolz at gmx.de>
branch nick: throw_log_away
timestamp: Thu 2006-08-17 13:10:57 +0200
message:
Throw away on-disk logfile when possible.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060920234641-daa0e6db0263b590
parent: pqm at pqm.ubuntu.com-20060920182612-3fb546b62554f8c5
parent: john at arbash-meinel.com-20060920223617-ee51f416037ec263
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-09-21 00:46:41 +0100
message:
(jam) fix StopIteration error: bug #46871
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920223617-ee51f416037ec263
parent: john at arbash-meinel.com-20060920223233-8ec5b9c560295b60
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stop-iteration-46871
timestamp: Wed 2006-09-20 17:36:17 -0500
message:
NEWS about fixing bug #46871
------------------------------------------------------------
merged: john at arbash-meinel.com-20060920223233-8ec5b9c560295b60
parent: pqm at pqm.ubuntu.com-20060920182612-3fb546b62554f8c5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: stop-iteration-46871
timestamp: Wed 2006-09-20 17:32:33 -0500
message:
When a weave file is empty, we should get WeaveFormatError, not StopIteration
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060920182612-3fb546b62554f8c5
parent: pqm at pqm.ubuntu.com-20060920135917-9b085ce8e1ba0d18
parent: abentley at panoramicfeedback.com-20060920173834-38c67f9818519017
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-20 19:26:12 +0100
message:
Update revert documentation
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060920173834-38c67f9818519017
parent: abentley at panoramicfeedback.com-20060920141816-53f613c09bce2a11
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-20 13:38:34 -0400
message:
Update docs again
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060920141816-53f613c09bce2a11
parent: abentley at panoramicfeedback.com-20060919193015-77581ebc6905a473
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-20 10:18:16 -0400
message:
Update revert help text
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060920135917-9b085ce8e1ba0d18
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
parent: abentley at panoramicfeedback.com-20060919193015-77581ebc6905a473
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-09-20 14:59:17 +0100
message:
Fix deprecated use of pending_merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060919193015-77581ebc6905a473
parent: abentley at panoramicfeedback.com-20060919190811-73a7a2ebfc75eb19
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-09-19 15:30:15 -0400
message:
Fix deprecated use of pending_merges
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060919190811-73a7a2ebfc75eb19
parent: aaron.bentley at utoronto.ca-20060906120001-b3d70c642260d590
parent: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2006-09-19 15:08:11 -0400
message:
Merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060919041747-9f0e1130a3a78022
parent: pqm at pqm.ubuntu.com-20060919035202-8174b4dc7ff91add
parent: robertc at robertcollins.net-20060919040303-d9edb788bcdd2f21
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-19 05:17:47 +0100
message:
Trivially cleanup BRANCH.TODO
------------------------------------------------------------
merged: robertc at robertcollins.net-20060919040303-d9edb788bcdd2f21
parent: andrew.bennetts at canonical.com-20060919030924-df342f90b1527b3f
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-09-19 14:03:03 +1000
message:
Trivially cleanup BRANCH.TODO
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060919035202-8174b4dc7ff91add
parent: pqm at pqm.ubuntu.com-20060918001802-9e7740eadcb127a4
parent: andrew.bennetts at canonical.com-20060919030924-df342f90b1527b3f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-09-19 04:52:02 +0100
message:
(Andrew Bennetts, Robert Collins) Add bzr+ssh:// url support and turn the smart server into a anonymous readonly server by default.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060919030924-df342f90b1527b3f
parent: andrew.bennetts at canonical.com-20060918095840-53ae8a55c60f636e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Tue 2006-09-19 13:09:24 +1000
message:
Improvements to test_bzr_connect_to_bzr_ssh based on review comments
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918095840-53ae8a55c60f636e
parent: andrew.bennetts at canonical.com-20060918094756-0fc9beb9cd638340
parent: robertc at robertcollins.net-20060918083454-a8913e95b2722ade
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 19:58:40 +1000
message:
Merge --allow-writes from Robert
------------------------------------------------------------
merged: robertc at robertcollins.net-20060918083454-a8913e95b2722ade
parent: pqm at pqm.ubuntu.com-20060918001802-9e7740eadcb127a4
parent: pqm at pqm.ubuntu.com-20060918001802-9e7740eadcb127a4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: readonly-server
timestamp: Mon 2006-09-18 18:34:54 +1000
message:
Add readonly support to the smart server, enabled by default via `bzr server`.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918094756-0fc9beb9cd638340
parent: andrew.bennetts at canonical.com-20060918075841-a4935a338ae68533
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 19:47:56 +1000
message:
Implement ParamikoVendor.connect_ssh
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918075841-a4935a338ae68533
parent: andrew.bennetts at canonical.com-20060918074805-7cc3d8a8222fc745
parent: pqm at pqm.ubuntu.com-20060918001802-9e7740eadcb127a4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 17:58:41 +1000
message:
Merge from bzr.dev
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918074805-7cc3d8a8222fc745
parent: andrew.bennetts at canonical.com-20060918061343-0d8eb343d0b5aedc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 17:48:05 +1000
message:
Use bzrlib rather than a bzr subprocess in test_bzr_connect_to_bzr_ssh.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918061343-0d8eb343d0b5aedc
parent: andrew.bennetts at canonical.com-20060918061331-2e7054dfa69f1dc0
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 16:13:43 +1000
message:
Remove a little bit of duplication in ssh.py
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918061331-2e7054dfa69f1dc0
parent: andrew.bennetts at canonical.com-20060918054323-ff9e1fbfe8d935db
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 16:13:31 +1000
message:
Expand docs about bzr+ssh:// slightly.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918054323-ff9e1fbfe8d935db
parent: andrew.bennetts at canonical.com-20060918053711-3aef5e6a0a538c53
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 15:43:23 +1000
message:
Skip test_bzr_connect_to_bzr_ssh if connect_ssh isn't implemented on the default vendor.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918053711-3aef5e6a0a538c53
parent: andrew.bennetts at canonical.com-20060918052741-f3aec942d5f070e6
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 15:37:11 +1000
message:
Comment polishing.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918052741-f3aec942d5f070e6
parent: andrew.bennetts at canonical.com-20060918051119-e6501d102613d928
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 15:27:41 +1000
message:
Tidy imports, skip test if paramiko isn't installed.
------------------------------------------------------------
merged: andrew.bennetts at canonical.com-20060918051119-e6501d102613d928
parent: pqm at pqm.ubuntu.com-20060916140354-1a9932f525bb7182
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bzr+ssh:// testing
timestamp: Mon 2006-09-18 15:11:19 +1000
message:
Make bzr+ssh:// actually work (at least with absolute paths).
This also adds an ugly blackbox test.
More information about the bazaar-commits
mailing list