Rev 3880: (jam) Merge bzr 1.10-final back into bzr.dev in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Dec 5 16:14:11 GMT 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3880
revision-id: pqm at pqm.ubuntu.com-20081205161407-zulgn2hssd85nsdk
parent: pqm at pqm.ubuntu.com-20081205135154-uwqcpl3lruah9fo3
parent: john at arbash-meinel.com-20081205153402-gdijhzyed62jfnqh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-12-05 16:14:07 +0000
message:
(jam) Merge bzr 1.10-final back into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3879.1.1
revision-id: john at arbash-meinel.com-20081205153402-gdijhzyed62jfnqh
parent: pqm at pqm.ubuntu.com-20081205135154-uwqcpl3lruah9fo3
parent: pqm at pqm.ubuntu.com-20081205152639-fk4ic12v7srk5rn3
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-12-05 09:34:02 -0600
message:
Merge 1.10-final back into bzr.dev (cleanup trailing whitespace in NEWS)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3871.1.4
revision-id: pqm at pqm.ubuntu.com-20081205152639-fk4ic12v7srk5rn3
parent: pqm at pqm.ubuntu.com-20081205145233-6qgdek3o9rc707h0
parent: john at arbash-meinel.com-20081205143309-takal6vjg6vpj7rr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.10
timestamp: Fri 2008-12-05 15:26:39 +0000
message:
(jam) Release bzr 1.10-final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3871.5.1
revision-id: john at arbash-meinel.com-20081205143309-takal6vjg6vpj7rr
parent: pqm at pqm.ubuntu.com-20081202062535-khqslu9vyrvzr7om
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.10-final
timestamp: Fri 2008-12-05 08:33:09 -0600
message:
Release bzr-1.10 final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3871.1.3
revision-id: pqm at pqm.ubuntu.com-20081205145233-6qgdek3o9rc707h0
parent: pqm at pqm.ubuntu.com-20081202062535-khqslu9vyrvzr7om
parent: john at arbash-meinel.com-20081205141246-oh4q75ql22754ncc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.10
timestamp: Fri 2008-12-05 14:52:33 +0000
message:
(jam) Fix bug #304841,
sort requests topologically and properly only check compression
parent.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3871.4.6
revision-id: john at arbash-meinel.com-20081205141246-oh4q75ql22754ncc
parent: john at arbash-meinel.com-20081203222940-7kh36q4ewhrwbwl7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 304841-not-present-chain
timestamp: Fri 2008-12-05 08:12:46 -0600
message:
Remove the import pdb; statement.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3871.4.5
revision-id: john at arbash-meinel.com-20081203222940-7kh36q4ewhrwbwl7
parent: john at arbash-meinel.com-20081203222758-s30tazlndlw7env0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 304841-not-present-chain
timestamp: Wed 2008-12-03 16:29:40 -0600
message:
NEWS about fixing bug #304841
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3871.4.4
revision-id: john at arbash-meinel.com-20081203222758-s30tazlndlw7env0
parent: john at arbash-meinel.com-20081203222454-f91otv07o8zgo2nv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 304841-not-present-chain
timestamp: Wed 2008-12-03 16:27:58 -0600
message:
Another fix for bug #304841. As a broad-spectrum solution,
always request in topological order.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3871.4.3
revision-id: john at arbash-meinel.com-20081203222454-f91otv07o8zgo2nv
parent: john at arbash-meinel.com-20081203222224-j2j5eef3jb38nloc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 304841-not-present-chain
timestamp: Wed 2008-12-03 16:24:54 -0600
message:
We should only care if the compression parent is not available, not if all parents are available.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3871.4.2
revision-id: john at arbash-meinel.com-20081203222224-j2j5eef3jb38nloc
parent: john at arbash-meinel.com-20081203210501-fejpuwpvfkvwogxd
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 304841-not-present-chain
timestamp: Wed 2008-12-03 16:22:24 -0600
message:
Finally a test case that reproduces bug #304841
modified:
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3871.4.1
revision-id: john at arbash-meinel.com-20081203210501-fejpuwpvfkvwogxd
parent: pqm at pqm.ubuntu.com-20081202062535-khqslu9vyrvzr7om
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 304841-not-present-chain
timestamp: Wed 2008-12-03 15:05:01 -0600
message:
Add a VFDecorator that can yield records in a specified order
modified:
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 3871.1.2
revision-id: pqm at pqm.ubuntu.com-20081202062535-khqslu9vyrvzr7om
parent: mbp at sourcefrog.net-20081128054531-b4pwjwcmcnj7qjod
parent: mbp at sourcefrog.net-20081202051251-jkvz010v9e79lepm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.10
timestamp: Tue 2008-12-02 06:25:35 +0000
message:
(mbp, #303856) Don't set a pack write cache from RepoFetcher
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3871.3.2
revision-id: mbp at sourcefrog.net-20081202051251-jkvz010v9e79lepm
parent: mbp at sourcefrog.net-20081202051107-h5s9na914q3anhkg
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 303856-write-caching
timestamp: Tue 2008-12-02 16:12:51 +1100
message:
Update news and bump version to 1.10rc2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3871.3.1
revision-id: mbp at sourcefrog.net-20081202051107-h5s9na914q3anhkg
parent: mbp at sourcefrog.net-20081128054531-b4pwjwcmcnj7qjod
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 303856-write-caching
timestamp: Tue 2008-12-02 16:11:07 +1100
message:
Don't set a pack write cache size from RepoFetcher, because the cache is not coherent with reads and causes ShortReadvErrors
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
Diff too large for email (2823 lines, the limit is 1000).
More information about the bazaar-commits
mailing list