At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3710
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: +trunk
timestamp: Wed 2008-09-17 09:04:07 +0100
message:
Merge 1.7 branch including fix for #269214 and #261315 back to trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/blackbox/test_init.py
test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3709.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-into-trunk
timestamp: Wed 2008-09-17 17:18:20 +1000
message:
Merge 1.7 branch including fix for #269214 and #261315 back to trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py
request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/blackbox/test_init.py
test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py
test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3697.2.6
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-into-1.7
timestamp: Wed 2008-09-17 14:33:24 +1000
message:
Merge 261315 fix into 1.7 branch
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py
request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py
test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3691.2.12
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Tue 2008-09-16 00:27:19 +1000
message:
Add test for coping without Branch.get_stacked_on_url
modified:
bzrlib/branch.py
branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py
remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3691.2.11
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Tue 2008-09-16 00:08:05 +1000
message:
More tests around RemoteBranch stacking.
Now passing its integration test.
modified:
bzrlib/remote.py
remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3691.2.10
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 23:37:21 +1000
message:
Update more test_remote tests
modified:
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3691.2.9
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 23:04:37 +1000
message:
Convert and update more test_remote tests
modified:
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3691.2.8
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 22:55:06 +1000
message:
Update some test_remote tests for Branch.get_stacked_on_url and with
clearer assertions
modified:
bzrlib/remote.py
remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3691.2.7
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 21:20:15 +1000
message:
FakeClient can know what calls to expect
modified:
bzrlib/remote.py
remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3691.2.6
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 19:42:16 +1000
message:
Disable RemoteBranch stacking, but get get_stacked_on_url working,
and passing back exceptions
modified:
bzrlib/remote.py
remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/request.py
request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py
test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3691.2.5
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 16:28:27 +1000
message:
Add Branch.get_stacked_on_url rpc and tests for same
modified:
bzrlib/remote.py
remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py
branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py
request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py
test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3691.2.4
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 15:31:48 +1000
message:
Add FakeRemoteTransport to clarify test_remote
modified:
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3691.2.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 15:16:17 +1000
message:
Factor out RemoteBranch._remote_path() and disable RemoteBranch
stacking
modified:
bzrlib/remote.py
remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3691.2.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Fri 2008-09-05 21:05:34 +1000
message:
Fix some problems in access to stacked repositories over hpss
(#261315)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py
remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3691.2.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: 261315-stacked-hpss
timestamp: Fri 2008-09-05 18:18:30 +1000
message:
RemoteBranch must configure stacking into the repository
modified:
bzrlib/remote.py
remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3697.2.5
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: 1.7
timestamp: Tue 2008-09-16 23:47:34 +0100
message:
Some small fixes for bzr 1.7rc2, prepare the version strings.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_init.py
test_init.py-20060309032856-a292116204d86eb7
------------------------------------------------------------
revno: 3697.5.6
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: 1.7rc2
timestamp: Tue 2008-09-16 17:15:49 -0500
message:
Merge and resolve NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3697.5.5
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: 1.7rc2
timestamp: Tue 2008-09-16 16:39:28 -0500
message:
Fix version strings.
modified:
bzrlib/__init__.py
__init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3697.5.4
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: 1.7rc2
timestamp: Tue 2008-09-16 16:38:29 -0500
message:
Merge vila's init[-repo] changes and add a NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py
builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_init.py
test_init.py-20060309032856-a292116204d86eb7
------------------------------------------------------------
revno: 3697.5.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: 1.7rc2
timestamp: Tue 2008-09-16 16:36:52 -0500
message:
NEWS for Andrew
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3697.5.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: 1.7rc2
timestamp: Tue 2008-09-16 16:35:41 -0500
message:
Merge Andrew's wrong repo format from Remote patch
modified:
bzrlib/bzrdir.py
bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/repository_implementations/__init__.py
__init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py
test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3697.2.4
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: 1.7
timestamp: Tue 2008-09-16 01:11:52 +0100
message:
Branching from a shared repository on a smart server now preserves
repository format (Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/repository_implementations/__init__.py
__init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py
test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3697.6.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
branch nick: wrong-repo-format-1.7
timestamp: Tue 2008-09-16 09:38:59 +1000
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3697.6.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
branch nick: wrong-repo-format-1.7
timestamp: Mon 2008-09-15 11:54:57 +1000
message:
Add test for preserving shared repository format when sprouting from
a smart server.
modified:
bzrlib/tests/repository_implementations/__init__.py
__init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py
test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3697.6.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
branch nick: wrong-repo-format-1.7
timestamp: Mon 2008-09-15 11:08:34 +1000
message:
Possible fix for bug 269214
modified:
bzrlib/bzrdir.py
bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3697.2.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: 1.7
timestamp: Fri 2008-09-12 08:30:13 +0100
message:
(spiv) Fix '_in_buffer' AttributeError when using the -Dhpss debug
flag.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/message.py
message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/protocol.py
protocol.py-20061108035435-ot0lstk2590yqhzr-1
------------------------------------------------------------
revno: 3697.5.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
author: Andrew Bennetts <[EMAIL PROTECTED]>
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: 1.7rc2
timestamp: Thu 2008-09-11 16:12:22 -0500
message:
Cherrypick Andrew's _get_buffer fix
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/message.py
message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/protocol.py
protocol.py-20061108035435-ot0lstk2590yqhzr-1
Diff too large for email (1021 lines, the limit is 1000).
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
