Rev 4029: Merge bzr.dev (avoids criss-cross for PQM. in http://people.ubuntu.com/~robertc/baz2.0/integration
Robert Collins
robertc at robertcollins.net
Fri Feb 20 10:49:04 GMT 2009
At http://people.ubuntu.com/~robertc/baz2.0/integration
------------------------------------------------------------
revno: 4029
revision-id: robertc at robertcollins.net-20090220104851-m0s7qwe6jzqkgj1f
parent: robertc at robertcollins.net-20090220082650-wmzch4en338bymkm
parent: pqm at pqm.ubuntu.com-20090220100854-p9g7snhipls2cj0z
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2009-02-20 21:48:51 +1100
message:
Merge bzr.dev (avoids criss-cross for PQM.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 4022.1.5
revision-id: pqm at pqm.ubuntu.com-20090220100854-p9g7snhipls2cj0z
parent: pqm at pqm.ubuntu.com-20090220092146-07rzjym3j54khv2m
parent: robertc at robertcollins.net-20090220092811-ob73a8lnxt6b4mc0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-02-20 10:08:54 +0000
message:
(robertc) Add the ability to suspend and resume write groups,
for use by smart server streaming push. (Andrew Bennetts,
Robert Collins)
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 4002.1.14
revision-id: robertc at robertcollins.net-20090220092811-ob73a8lnxt6b4mc0
parent: andrew.bennetts at canonical.com-20090220075041-7mfu1227ugl6mu8i
parent: pqm at pqm.ubuntu.com-20090220092146-07rzjym3j54khv2m
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2009-02-20 20:28:11 +1100
message:
Resolve conflicts.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 4002.1.13
revision-id: andrew.bennetts at canonical.com-20090220075041-7mfu1227ugl6mu8i
parent: andrew.bennetts at canonical.com-20090220073312-7qhmlz8j2j4ygpob
parent: robertc at robertcollins.net-20090220074552-q7gauu6msiusotyg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Fri 2009-02-20 18:50:41 +1100
message:
Merge one-line fix from Robert.
------------------------------------------------------------
revno: 4002.1.12
revision-id: andrew.bennetts at canonical.com-20090220073312-7qhmlz8j2j4ygpob
parent: andrew.bennetts at canonical.com-20090220070944-eseqlacdo9tf9hvn
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Fri 2009-02-20 18:33:12 +1100
message:
Add another test, fix the code so it passes, and remove some cruft.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
------------------------------------------------------------
revno: 4002.1.11
revision-id: andrew.bennetts at canonical.com-20090220070944-eseqlacdo9tf9hvn
parent: andrew.bennetts at canonical.com-20090220070202-loy92ps314pvxo17
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Fri 2009-02-20 18:09:44 +1100
message:
Fix latest test.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
------------------------------------------------------------
revno: 4002.1.10
revision-id: andrew.bennetts at canonical.com-20090220070202-loy92ps314pvxo17
parent: andrew.bennetts at canonical.com-20090220062036-f6x2q1m162fx3ymq
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Fri 2009-02-20 18:02:02 +1100
message:
Fix some existing tests, add a new test that fails.
modified:
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
------------------------------------------------------------
revno: 4002.1.9
revision-id: andrew.bennetts at canonical.com-20090220062036-f6x2q1m162fx3ymq
parent: andrew.bennetts at canonical.com-20090220061622-te9miq29rlfqiwwv
parent: robertc at robertcollins.net-20090220023828-rcqd2pyw22zqjkwl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Fri 2009-02-20 17:20:36 +1100
message:
Merge VersionedFiles.insert-record-stream.partial from Robert.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 4002.1.8
revision-id: andrew.bennetts at canonical.com-20090220061622-te9miq29rlfqiwwv
parent: andrew.bennetts at canonical.com-20090217033235-wtyd3u62xhxuwixy
parent: pqm at pqm.ubuntu.com-20090220041509-nyuby6mehjjuaycj
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Fri 2009-02-20 17:16:22 +1100
message:
Merge bzr.dev.
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
tools/prepare_for_latex.py prepare_for_latex.py-20090212165735-79tn1t4dhnxyz7m9-1
tools/rst2pdf.py rst2pdf.py-20090212165735-79tn1t4dhnxyz7m9-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commands.py test_command.py-20051019190109-3b17be0f52eaa7a8
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 4002.1.7
revision-id: andrew.bennetts at canonical.com-20090217033235-wtyd3u62xhxuwixy
parent: andrew.bennetts at canonical.com-20090217032221-4qo1ptuypt8u78wu
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Tue 2009-02-17 14:32:35 +1100
message:
Rename UnresumableWriteGroups to UnresumableWriteGroup.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 4002.1.6
revision-id: andrew.bennetts at canonical.com-20090217032221-4qo1ptuypt8u78wu
parent: andrew.bennetts at canonical.com-20090217030914-rgz7s50nnitgssjz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Tue 2009-02-17 14:22:21 +1100
message:
Remove obsolete XXX.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 4002.1.5
revision-id: andrew.bennetts at canonical.com-20090217030914-rgz7s50nnitgssjz
parent: andrew.bennetts at canonical.com-20090217023805-pwaf09urjzs8bmdx
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Tue 2009-02-17 14:09:14 +1100
message:
Fix possible security issue with resuming write groups: make sure the token is well-formed so that it's not possible to steal a write group from another repo.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 4002.1.4
revision-id: andrew.bennetts at canonical.com-20090217023805-pwaf09urjzs8bmdx
parent: andrew.bennetts at canonical.com-20090216034436-el4i5q362kciqp4w
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Tue 2009-02-17 13:38:05 +1100
message:
Remove a little more duplication, add some more tests (some passing, some not).
modified:
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
------------------------------------------------------------
revno: 4002.1.3
revision-id: andrew.bennetts at canonical.com-20090216034436-el4i5q362kciqp4w
parent: andrew.bennetts at canonical.com-20090216034239-s8hckut73cvmpdfs
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Mon 2009-02-16 14:44:36 +1100
message:
Remove more duplication, put resumable write group tests in separate TestCase.
modified:
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
------------------------------------------------------------
revno: 4002.1.2
revision-id: andrew.bennetts at canonical.com-20090216034239-s8hckut73cvmpdfs
parent: andrew.bennetts at canonical.com-20090213073440-qzvli80q9729jvce
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Mon 2009-02-16 14:42:39 +1100
message:
Refactor out some duplication in write_group tests.
modified:
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
------------------------------------------------------------
revno: 4002.1.1
revision-id: andrew.bennetts at canonical.com-20090213073440-qzvli80q9729jvce
parent: pqm at pqm.ubuntu.com-20090212024000-dvdhpm2mela5h6f7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: suspend-write-group
timestamp: Fri 2009-02-13 18:34:40 +1100
message:
Implement suspend_write_group/resume_write_group.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 4022.1.4
revision-id: pqm at pqm.ubuntu.com-20090220092146-07rzjym3j54khv2m
parent: pqm at pqm.ubuntu.com-20090220082449-8wtrcem3dypgq53q
parent: robertc at robertcollins.net-20090220084002-e49vh0sxlkxhzt2m
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-02-20 09:21:46 +0000
message:
(robertc) Add network serialisation for VersionedFile record_streams.
(Robert Collins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
------------------------------------------------------------
revno: 4005.3.9
revision-id: robertc at robertcollins.net-20090220084002-e49vh0sxlkxhzt2m
parent: robertc at robertcollins.net-20090220064830-wyj52q6rl2gygqsa
parent: pqm at pqm.ubuntu.com-20090220082449-8wtrcem3dypgq53q
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2009-02-20 19:40:02 +1100
message:
Resolve NEWS conflicts.
added:
bzrlib/help_topics/en/log-formats.txt logformats.txt-20090209081655-5wpbws2oqz8k5oq7-1
tools/prepare_for_latex.py prepare_for_latex.py-20090212165735-79tn1t4dhnxyz7m9-1
tools/rst2pdf.py rst2pdf.py-20090212165735-79tn1t4dhnxyz7m9-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
tools/win32/build_release.py build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 4022.1.3
revision-id: pqm at pqm.ubuntu.com-20090220082449-8wtrcem3dypgq53q
parent: pqm at pqm.ubuntu.com-20090220071304-mb95xwtanwl2bqa4
parent: robertc at robertcollins.net-20090220074552-q7gauu6msiusotyg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2009-02-20 08:24:49 +0000
message:
(robertc) Allow VersionedFiles to insert and hold record streams
which need missing compression parents. (Andrew Bennetts,
Robert Collins)
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 4009.3.13
revision-id: robertc at robertcollins.net-20090220074552-q7gauu6msiusotyg
parent: robertc at robertcollins.net-20090220023828-rcqd2pyw22zqjkwl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2009-02-20 18:45:52 +1100
message:
Fix typo.
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 4009.3.12
revision-id: robertc at robertcollins.net-20090220023828-rcqd2pyw22zqjkwl
parent: robertc at robertcollins.net-20090220015545-qloec8tf9jnqi2d8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: VersionedFiles.insert-record-stream.partial
timestamp: Fri 2009-02-20 13:38:28 +1100
message:
Polish on inserting record streams with missing compression parents.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 4009.3.11
revision-id: robertc at robertcollins.net-20090220015545-qloec8tf9jnqi2d8
parent: andrew.bennetts at canonical.com-20090220012317-xyijy32wo1flhaxo
parent: pqm at pqm.ubuntu.com-20090220012608-hh2rwz1cqd43mjrm
committer: Robert Collins <robertc at robertcollins.net>
branch nick: VersionedFiles.insert-record-stream.partial
timestamp: Fri 2009-02-20 12:55:45 +1100
message:
Merge bzr.dev (resolve knit.py conflicts).
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/shelf_ui.py shelver.py-20081005210102-33worgzwrtdw0yrm-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_shelf_ui.py test_shelf_ui.py-20081027155203-wtcuazg85wp9u4fv-1
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_ui.py test_ui.py-20051130162854-458e667a7414af09
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/ui/text.py text.py-20051130153916-2e438cffc8afc478
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 4009.3.10
revision-id: andrew.bennetts at canonical.com-20090220012317-xyijy32wo1flhaxo
parent: andrew.bennetts at canonical.com-20090220012200-cw346vv8xz4o18mr
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: missing-parents-integration
timestamp: Fri 2009-02-20 12:23:17 +1100
message:
Remove more cruft.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 4009.3.9
revision-id: andrew.bennetts at canonical.com-20090220012200-cw346vv8xz4o18mr
parent: andrew.bennetts at canonical.com-20090220010452-eb19b0owqfmfuwcb
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: missing-parents-integration
timestamp: Fri 2009-02-20 12:22:00 +1100
message:
Remove some XXXs.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 4009.3.8
revision-id: andrew.bennetts at canonical.com-20090220010452-eb19b0owqfmfuwcb
parent: andrew.bennetts at canonical.com-20090220005210-df3lbaxuyv754oju
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: missing-parents-integration
timestamp: Fri 2009-02-20 12:04:52 +1100
message:
Fix test failure.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 4009.3.7
revision-id: andrew.bennetts at canonical.com-20090220005210-df3lbaxuyv754oju
parent: andrew.bennetts at canonical.com-20090219054246-c9vqv0u1ow1cs5ev
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: missing-parents-integration
timestamp: Fri 2009-02-20 11:52:10 +1100
message:
Most tests passing.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
------------------------------------------------------------
revno: 4009.3.6
revision-id: andrew.bennetts at canonical.com-20090219054246-c9vqv0u1ow1cs5ev
parent: andrew.bennetts at canonical.com-20090218004640-31m284sljo9myc00
parent: andrew.bennetts at canonical.com-20090219035237-o147dwr881zgd71d
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: missing-parents-integration
timestamp: Thu 2009-02-19 16:42:46 +1100
message:
Merge missing-parents-in-pack-index.
modified:
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
------------------------------------------------------------
revno: 4009.3.5
revision-id: andrew.bennetts at canonical.com-20090218004640-31m284sljo9myc00
parent: andrew.bennetts at canonical.com-20090218004328-0mws03fs0sfflpmn
parent: andrew.bennetts at canonical.com-20090217054444-xhb5m6x05tjf5b26
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: missing-parents-integration
timestamp: Wed 2009-02-18 11:46:40 +1100
message:
Merge missing-parents-in-pack-index work-in-progress.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 4009.3.4
revision-id: andrew.bennetts at canonical.com-20090218004328-0mws03fs0sfflpmn
parent: andrew.bennetts at canonical.com-20090217012534-k6574qvmaibkeehi
parent: pqm at pqm.ubuntu.com-20090216172448-vj35mjoe463c3bk2
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: insert_record_stream-missing-parents
timestamp: Wed 2009-02-18 11:43:28 +1100
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
tools/packaging/build-packages.sh buildpackages.sh-20080821102059-fzlodktas65qmo1k-1
tools/packaging/update-changelogs.sh updatechangelogs.sh-20080821102059-fzlodktas65qmo1k-2
tools/packaging/update-packaging-branches.sh updatepackagingbranc-20080825210254-6is8ciit1yzyd3a2-1
------------------------------------------------------------
revno: 4009.3.3
revision-id: andrew.bennetts at canonical.com-20090217012534-k6574qvmaibkeehi
parent: andrew.bennetts at canonical.com-20090217005419-i9qdpanq2cwm3j59
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: insert_record_stream-missing-parents
timestamp: Tue 2009-02-17 12:25:34 +1100
message:
Add docstrings.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 4009.3.2
revision-id: andrew.bennetts at canonical.com-20090217005419-i9qdpanq2cwm3j59
parent: andrew.bennetts at canonical.com-20090216051228-bfsjg5hvvbtu7wg5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: insert_record_stream-missing-parents
timestamp: Tue 2009-02-17 11:54:19 +1100
message:
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
------------------------------------------------------------
revno: 4009.3.1
revision-id: andrew.bennetts at canonical.com-20090216051228-bfsjg5hvvbtu7wg5
parent: pqm at pqm.ubuntu.com-20090215032052-9749wepsy6dgnq9l
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: insert_record_stream-missing-parents
timestamp: Mon 2009-02-16 16:12:28 +1100
message:
Fix test_insert_record_stream_delta_missing_basis_no_corruption to test what it claims to, and fix KnitVersionedFiles.get_record_stream to match the expected exception.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
Diff too large for email (1324 lines, the limit is 1000).
More information about the bazaar-commits
mailing list