Rev 1999: Merge bzr.dev. in file:///home/robertc/source/baz/integration/
Robert Collins
robertc at robertcollins.net
Wed Oct 4 04:25:44 BST 2006
------------------------------------------------------------
revno: 1999
revision-id: robertc at robertcollins.net-20061004032543-58e96ff9d0e25d9c
parent: robertc at robertcollins.net-20060928231059-e8d068d63b81d3f1
parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-10-04 13:25:43 +1000
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/transport/smart.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
parent: robertc at robertcollins.net-20061002002513-c7cf0fe6ec467027
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2006-10-02 01:43:10 +0100
message:
Merge in 0.11 NEWS entry.
------------------------------------------------------------
merged: robertc at robertcollins.net-20061002002513-c7cf0fe6ec467027
parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bzr.dev
timestamp: Mon 2006-10-02 10:25:13 +1000
message:
Merge in 0.11 NEWS entry.
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
parent: pqm at pqm.ubuntu.com-20060929204735-9766f6fcb27c4b22
parent: john at arbash-meinel.com-20060929203952-d31a8e77e9b2b171
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 21:57:29 +0100
message:
(jam) Clean up BZR_HOME in ENV for the test suite
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929203952-d31a8e77e9b2b171
parent: john at arbash-meinel.com-20060929174315-796535c31fa0d121
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 15:39:52 -0500
message:
Clean up BZR_HOME in ENV for the test suite
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060929204735-9766f6fcb27c4b22
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
parent: john at arbash-meinel.com-20060929174315-796535c31fa0d121
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 21:47:35 +0100
message:
(jam) find python2.5 if 2.4 is not available
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929174315-796535c31fa0d121
parent: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 12:43:15 -0500
message:
Find python2.5 if 2.4 cannot be found
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060929173730-d05521a9d8f0a31f
parent: pqm at pqm.ubuntu.com-20060929163445-4c546bbfc3328d82
parent: john at arbash-meinel.com-20060929170751-15b398c539e26d21
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 18:37:30 +0100
message:
(bialix) win32 needs binary line-endings for a test
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929170751-15b398c539e26d21
parent: pqm at pqm.ubuntu.com-20060929163445-4c546bbfc3328d82
parent: bialix at ukr.net-20060929111551-7c6c3e5171e642d9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 12:07:51 -0500
message:
(bialix) win32 needs binary line-endings for a test
------------------------------------------------------------
merged: bialix at ukr.net-20060929111551-7c6c3e5171e642d9
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: test_on_vfat.win32.fix
timestamp: Fri 2006-09-29 14:15:51 +0300
message:
test_on_vfat win32 fix: use binary line-endings
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060929163445-4c546bbfc3328d82
parent: pqm at pqm.ubuntu.com-20060929153152-9a32a9b020e0f74b
parent: abentley at panoramicfeedback.com-20060929130933-937dc423abda3806
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 17:34:45 +0100
message:
Implement BzrDir.destroy_tree and destroy_tree_metadata
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060929130933-937dc423abda3806
parent: abentley at panoramicfeedback.com-20060927212736-60cf96bee720ad83
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2006-09-29 09:09:33 -0400
message:
Cleaner implementation of destroy_working_tree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927212736-60cf96bee720ad83
parent: abentley at panoramicfeedback.com-20060927212521-2306c9722b5eb4d0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 17:27:36 -0400
message:
Introduce BzrDir.destroy_workingtree
------------------------------------------------------------
merged: abentley at panoramicfeedback.com-20060927212521-2306c9722b5eb4d0
parent: abentley at panoramicfeedback.com-20060927203408-883d6620eaad303c
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2006-09-27 17:25:21 -0400
message:
merge bzr.dev
------------------------------------------------------------
merged: pqm at pqm.ubuntu.com-20060929153152-9a32a9b020e0f74b
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
parent: john at arbash-meinel.com-20060929141056-5135fe85f4d4be3c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-09-29 16:31:52 +0100
message:
Lukáš Lalinský: Windows-speficic smart server transport selftest fixes.
------------------------------------------------------------
merged: john at arbash-meinel.com-20060929141056-5135fe85f4d4be3c
parent: pqm at pqm.ubuntu.com-20060928161539-3fc7d0f247fcfc5b
parent: lalinsky at gmail.com-20060928103113-1a9d9ce0ee7afead
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2006-09-29 09:10:56 -0500
message:
Lukáš Lalinský: Windows-speficic smart server transport selftest fixes.
------------------------------------------------------------
merged: lalinsky at gmail.com-20060928103113-1a9d9ce0ee7afead
parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
committer: Lukáš Lalinský <lalinsky at gmail.com>
branch nick: bzr.win32-selftest
timestamp: Thu 2006-09-28 12:31:13 +0200
message:
Windows-speficic smart server transport selftest fixes.
More information about the bazaar-commits
mailing list