Rev 2674: Merge bzr.dev to resolve conflicts. in http://people.ubuntu.com/~robertc/baz2.0/integration
Robert Collins
robertc at robertcollins.net
Wed Aug 8 03:38:52 BST 2007
At http://people.ubuntu.com/~robertc/baz2.0/integration
------------------------------------------------------------
revno: 2674
revision-id: robertc at robertcollins.net-20070808023839-378veg8r9zbaqb4m
parent: robertc at robertcollins.net-20070808022602-p2ufghtfektvnc3u
parent: pqm at pqm.ubuntu.com-20070808002810-703n3mr6b6hwataj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-08-08 12:38:39 +1000
message:
Merge bzr.dev to resolve conflicts.
added:
bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
bzrlib/tests/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
renamed:
doc/developers/HACKING => doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
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_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2670.1.12
revision-id: pqm at pqm.ubuntu.com-20070808002810-703n3mr6b6hwataj
parent: pqm at pqm.ubuntu.com-20070807225230-7gb6fot3mnsxp7zs
parent: robertc at robertcollins.net-20070807225945-dlxppeb3we4lh897
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-08-08 01:28:10 +0100
message:
(robertc) Introduce write_groups for repositories, allowing repositories with the physical ability to do transactional data insertion to have that modelled within bzr. (Robert Collins).
added:
bzrlib/tests/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
------------------------------------------------------------
revno: 2617.6.9
revision-id: robertc at robertcollins.net-20070807225945-dlxppeb3we4lh897
parent: robertc at robertcollins.net-20070801002037-cjf6ja1y3zzw5f2e
parent: pqm at pqm.ubuntu.com-20070807225230-7gb6fot3mnsxp7zs
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-08-08 08:59:45 +1000
message:
Merge bzr.dev.
added:
bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/benchmarks/bench_dirstate.py bench_dirstate.py-20070503203500-gs0pz6zkvjpq9l2x-1
bzrlib/email_message.py email_message.py-20070718143823-660zfcl54xi1v65u-1
bzrlib/tests/commands/ commands-20070518182516-v16lhwkl07jbj1k2-1
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/commands/test_branch.py test_branch.py-20070520173042-ou3a796w3xn1y8ps-1
bzrlib/tests/commands/test_cat.py test_cat.py-20070525170351-vg2apsfb5j413913-1
bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/commands/test_merge.py test_merge.py-20070525163813-v8yfs5wu77hjsx0o-1
bzrlib/tests/commands/test_missing.py test_missing.py-20070525171057-qr1z4sleurlp9b5v-1
bzrlib/tests/commands/test_pull.py test_pull.py-20070525144918-cgmunk4ici2krjnd-1
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
bzrlib/tests/test_email_message.py test_email_message.p-20070718143823-660zfcl54xi1v65u-2
bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
doc/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
renamed:
bzrlib/tests/blackbox/test_submit.py => bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
doc/developers/HACKING => doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/benchmarks/__init__.py __init__.py-20060516064526-eb0d37c78e86065d
bzrlib/benchmarks/bench_bundle.py bench_bundle.py-20060719055338-o1c6ieybbwt6c3zv-1
bzrlib/benchmarks/bench_checkout.py bench_checkout.py-20060521233052-b52eba18ee46046b
bzrlib/benchmarks/bench_commit.py bench_commit.py-20060522031508-4ea2551904e4becb
bzrlib/benchmarks/bench_log.py bench_log.py-20060611214524-mr18tk29h8v0qb4x-1
bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2617.6.8
revision-id: robertc at robertcollins.net-20070801002037-cjf6ja1y3zzw5f2e
parent: robertc at robertcollins.net-20070731005340-g78eko5xn23lhpq3
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repo-write-group
timestamp: Wed 2007-08-01 10:20:37 +1000
message:
Review feedback and documentation.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
------------------------------------------------------------
revno: 2617.6.7
revision-id: robertc at robertcollins.net-20070731005340-g78eko5xn23lhpq3
parent: robertc at robertcollins.net-20070731005211-vcncoanpgu8qnu03
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repo-write-group
timestamp: Tue 2007-07-31 10:53:40 +1000
message:
More review feedback.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 2617.6.6
revision-id: robertc at robertcollins.net-20070731005211-vcncoanpgu8qnu03
parent: robertc at robertcollins.net-20070720022713-z6x6cns4dy1mzhpk
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repo-write-group
timestamp: Tue 2007-07-31 10:52:11 +1000
message:
Some review feedback.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 2617.6.5
revision-id: robertc at robertcollins.net-20070720022713-z6x6cns4dy1mzhpk
parent: robertc at robertcollins.net-20070719002827-t1pu9alpneh3k966
parent: pqm at pqm.ubuntu.com-20070720015347-eaeqmggngaemmbde
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repo-write-group
timestamp: Fri 2007-07-20 12:27:13 +1000
message:
Merge bzr.dev.
removed:
bzrlib/bundle/common.py common.py-20050619223838-f25048f6638f04c6
bzrlib/bundle/old/ old-20051119041827-8f2417a9cc3b67f2
bzrlib/bundle/old/send_changeset.py send_changeset.py-20050628200204-9478d383946f1871
added:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/file_names.py file_collection.py-20070714100753-j2zz4ahtk331k5zm-1
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/plugins/multiparent.py mpregen-20070411063203-5x9z7i73add0d6f6-1
bzrlib/tests/test_file_names.py test_file_collection-20070714093417-5gc9d821to85zo4t-1
bzrlib/tests/test_multiparent.py test_multiparent.py-20070410133617-n1jdhcc1n1mibarp-4
bzrlib/transport/unlistable.py unlistable.py-20070714093417-5gc9d821to85zo4t-2
doc/developers/bundle-format4.txt bundleformat4.txt-20070621120628-r3332ovd8u4agv8i-1
renamed:
bzrlib/tests/blackbox/test_bundle.py => bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/apply_bundle.py apply_changeset.py-20050620044656-dba4eb8021a36f95
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bundle/serializer/v08.py v06.py-20051119041339-ee43f97270b01823
bzrlib/bundle/serializer/v09.py v09.py-20060921014829-2l5elu11mu2ubvek-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-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_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
tools/capture_tree.py capture_tree.py-20051004100938-c7ff053182f5ae51
tools/rst2prettyhtml.py rst2prettyhtml.py-20060929181914-t7dh62f2wxi0i5aj-1
tools/trace-revisions tracerevisions-20051107162041-9dfee0a7324d206d
bzrlib/tests/blackbox/test_submit.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
------------------------------------------------------------
revno: 2617.6.4
revision-id: robertc at robertcollins.net-20070719002827-t1pu9alpneh3k966
parent: robertc at robertcollins.net-20070718234410-sa56x9ui5la405jf
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repo-write-group
timestamp: Thu 2007-07-19 10:28:27 +1000
message:
Update tests with things that break when a repository requires write groups to be used.
modified:
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2617.6.3
revision-id: robertc at robertcollins.net-20070718234410-sa56x9ui5la405jf
parent: robertc at robertcollins.net-20070717160400-l1ng2wgmldsttebk
parent: pqm at pqm.ubuntu.com-20070717110203-zzmtp28nunhsoz12
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repo-write-group
timestamp: Thu 2007-07-19 09:44:10 +1000
message:
Merge bzr.dev.
added:
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/tests/test_index.py test_index.py-20070712131115-lolkarso50vjr64s-2
bzrlib/util/tests/ bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
bzrlib/util/tests/__init__.py __init__.py-20070713054446-oliu3oth0gy08y0t-1
bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
doc/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/developers/diff.txt diff.txt-20070716233605-2q6jzorua7mr42jk-1
doc/developers/indices.txt indices.txt-20070713142939-m5cdnp31u8ape0td-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
doc/README.1st README.1st-20060314161707-b943d5d4cce669b6
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/plugins.txt plugins.txt-20060314145616-525099a747f3ffdd
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 2617.6.2
revision-id: robertc at robertcollins.net-20070717160400-l1ng2wgmldsttebk
parent: robertc at robertcollins.net-20070716110120-9we93ynxjza948vd
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repo-write-group
timestamp: Wed 2007-07-18 02:04:00 +1000
message:
Add abort_write_group and wire write_groups into fetch and commit.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
------------------------------------------------------------
revno: 2617.6.1
revision-id: robertc at robertcollins.net-20070716110120-9we93ynxjza948vd
parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repo-write-group
timestamp: Mon 2007-07-16 21:01:20 +1000
message:
* New method on Repository - ``start_write_group``, ``end_write_group``
and ``is_in_write_group`` - which provide a clean hook point for
transactional Repositories - ones where all the data for a fetch or
commit needs to be made atomically available in one step. This allows
the write lock to remain while making a series of data insertions.
(e.g. data conversion). (Robert Collins)
added:
bzrlib/tests/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
------------------------------------------------------------
revno: 2670.1.11
revision-id: pqm at pqm.ubuntu.com-20070807225230-7gb6fot3mnsxp7zs
parent: pqm at pqm.ubuntu.com-20070807214342-ti2fzm7m9br66daj
parent: abentley at panoramicfeedback.com-20070807204547-b4mxyy3t3kokgkkw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-08-07 23:52:30 +0100
message:
Add ancestry graph for test case
modified:
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.84
revision-id: abentley at panoramicfeedback.com-20070807204547-b4mxyy3t3kokgkkw
parent: abentley at panoramicfeedback.com-20070807203614-nz9lwqenyyjfd3yc
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2007-08-07 16:45:47 -0400
message:
Add ancestry graph for test case
modified:
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 2670.1.10
revision-id: pqm at pqm.ubuntu.com-20070807214342-ti2fzm7m9br66daj
parent: pqm at pqm.ubuntu.com-20070807200109-d25wg4bqp97uo9d5
parent: abentley at panoramicfeedback.com-20070807203614-nz9lwqenyyjfd3yc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-08-07 22:43:42 +0100
message:
Update test documentation
modified:
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.83
revision-id: abentley at panoramicfeedback.com-20070807203614-nz9lwqenyyjfd3yc
parent: abentley at panoramicfeedback.com-20070807183310-otmzbpy694aa75am
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2007-08-07 16:36:14 -0400
message:
Update test documentation
modified:
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 2670.1.9
revision-id: pqm at pqm.ubuntu.com-20070807200109-d25wg4bqp97uo9d5
parent: pqm at pqm.ubuntu.com-20070807191900-kuqpkgh4sq9fczil
parent: abentley at panoramicfeedback.com-20070807183310-otmzbpy694aa75am
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-08-07 21:01:09 +0100
message:
Fix KeyError in Graph.filter_candidate_lca corner case
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.82
revision-id: abentley at panoramicfeedback.com-20070807183310-otmzbpy694aa75am
parent: abentley at panoramicfeedback.com-20070807152626-hii4pfmff3ayxxp9
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2007-08-07 14:33:10 -0400
message:
Add symmetrical alternative to test case
modified:
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.81
revision-id: abentley at panoramicfeedback.com-20070807152626-hii4pfmff3ayxxp9
parent: abentley at panoramicfeedback.com-20070807152033-tjdm70lytg1e1x1h
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2007-08-07 11:26:26 -0400
message:
Remove testing code
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.80
revision-id: abentley at panoramicfeedback.com-20070807152033-tjdm70lytg1e1x1h
parent: abentley at panoramicfeedback.com-20070807151634-h9viyci8exz07pph
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2007-08-07 11:20:33 -0400
message:
Add NEWS entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.79
revision-id: abentley at panoramicfeedback.com-20070807151634-h9viyci8exz07pph
parent: aaron.bentley at utoronto.ca-20070801134616-a3xct6wpqugrxaj3
parent: pqm at pqm.ubuntu.com-20070807082835-sxq0vmfbvsebps5z
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2007-08-07 11:16:34 -0400
message:
Merge bzr.dev
added:
bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
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_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.78
revision-id: aaron.bentley at utoronto.ca-20070801134616-a3xct6wpqugrxaj3
parent: aaron.bentley at utoronto.ca-20070731112050-5x29s1kop4x19s05
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-08-01 09:46:16 -0400
message:
Fix KeyError in filter_candidate_lca
modified:
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
------------------------------------------------------------
revno: 2670.1.8
revision-id: pqm at pqm.ubuntu.com-20070807191900-kuqpkgh4sq9fczil
parent: pqm at pqm.ubuntu.com-20070807082835-sxq0vmfbvsebps5z
parent: bialix at ukr.net-20070807173524-1y0huvbb1503cfbv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-08-07 20:19:00 +0100
message:
HTML documentation now use files extension *.html (bialix,r=ian)
renamed:
doc/developers/HACKING => doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2666.2.3
revision-id: bialix at ukr.net-20070807173524-1y0huvbb1503cfbv
parent: bialix at ukr.net-20070807171929-c6jna7ftya3uqylm
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: htm2html
timestamp: Tue 2007-08-07 20:35:24 +0300
message:
fixes after Ian's review
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 2666.2.2
revision-id: bialix at ukr.net-20070807171929-c6jna7ftya3uqylm
parent: bialix at ukr.net-20070802102836-45ys1axb2uak8rno
parent: pqm at pqm.ubuntu.com-20070807082835-sxq0vmfbvsebps5z
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: htm2html
timestamp: Tue 2007-08-07 20:19:29 +0300
message:
merge bzr.dev
added:
bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
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_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
------------------------------------------------------------
revno: 2666.2.1
revision-id: bialix at ukr.net-20070802102836-45ys1axb2uak8rno
parent: pqm at pqm.ubuntu.com-20070801171451-en3tds1hzlru2j83
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: htm2html
timestamp: Thu 2007-08-02 13:28:36 +0300
message:
change generated documentation extension from htm to html
renamed:
doc/developers/HACKING => doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2670.1.7
revision-id: pqm at pqm.ubuntu.com-20070807082835-sxq0vmfbvsebps5z
parent: pqm at pqm.ubuntu.com-20070807071734-qrnzeyjktp2f7022
parent: andrew.bennetts at canonical.com-20070807074727-5vmpk09r98lyef00
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-08-07 09:28:35 +0100
message:
(Andrew Bennetts) Remove Repository.__eq__/__ne__ methods, replace with has_same_location method.
added:
bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2670.1.1.1.5
revision-id: andrew.bennetts at canonical.com-20070807074727-5vmpk09r98lyef00
parent: andrew.bennetts at canonical.com-20070807070458-pk3iwe1999bk1lz1
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: repository-equality
timestamp: Tue 2007-08-07 17:47:27 +1000
message:
Move has_same_location tests to a new file.
added:
bzrlib/tests/repository_implementations/test_has_same_location.py test_has_same_locati-20070807074648-2i2ah82fbe83iys7-1
modified:
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2670.1.1.1.4
revision-id: andrew.bennetts at canonical.com-20070807070458-pk3iwe1999bk1lz1
parent: andrew.bennetts at canonical.com-20070807014056-al2nq16umo9f5gc5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: repository-equality
timestamp: Tue 2007-08-07 17:04:58 +1000
message:
Rename is_same_repository to has_same_location, thanks Aaron!
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2670.1.1.1.3
revision-id: andrew.bennetts at canonical.com-20070807014056-al2nq16umo9f5gc5
parent: andrew.bennetts at canonical.com-20070806051155-t570bk2i3gcnebwr
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: repository-equality
timestamp: Tue 2007-08-07 11:40:56 +1000
message:
Remove Repository.__eq__/__ne__ methods, replace with is_same_repository method.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2670.1.6
revision-id: pqm at pqm.ubuntu.com-20070807071734-qrnzeyjktp2f7022
parent: pqm at pqm.ubuntu.com-20070807061316-b32atzzop4r4y21g
parent: ian.clatworthy at internode.on.net-20070807063833-12nu9ot1g7s1w6g8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-08-07 08:17:34 +0100
message:
(Marius Kruger) InterTree.compare doesn't pass require_versioned on correctly
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 2670.1.5.1.2
revision-id: ian.clatworthy at internode.on.net-20070807063833-12nu9ot1g7s1w6g8
parent: ian.clatworthy at internode.on.net-20070807063544-vkmq3rfivhhri7ij
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-08-07 16:38:33 +1000
message:
Updated NEWS re Marius Kruger's InterTree.compare fix
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2670.1.5.1.1
revision-id: ian.clatworthy at internode.on.net-20070807063544-vkmq3rfivhhri7ij
parent: pqm at pqm.ubuntu.com-20070807061316-b32atzzop4r4y21g
parent: amanic at gmail.com-20070731194215-4d9r1l48kr4or3wj
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-08-07 16:35:44 +1000
message:
(Marius Kruger) InterTree.compare doesn't pass require_versioned on correctly
modified:
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 2655.2.2
revision-id: amanic at gmail.com-20070731194215-4d9r1l48kr4or3wj
parent: amanic at gmail.com-20070728224528-u22jpgybnzjghd9l
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.intertree_compare_ignores_param
timestamp: Tue 2007-07-31 21:42:15 +0200
message:
Rather use assertRaises in test_changes_from_with_require_versioned
modified:
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
------------------------------------------------------------
revno: 2655.2.1
revision-id: amanic at gmail.com-20070728224528-u22jpgybnzjghd9l
parent: pqm at pqm.ubuntu.com-20070727061532-14ly852y2g2dbcb8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.intertree_compare_ignores_param
timestamp: Sun 2007-07-29 00:45:28 +0200
message:
InterTree.compare and delta._compare_trees did not pass its
parameter require_versioned on correctly.
modified:
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 2670.1.5
revision-id: pqm at pqm.ubuntu.com-20070807061316-b32atzzop4r4y21g
parent: pqm at pqm.ubuntu.com-20070806055227-fzq7gamylj0eo610
parent: ian.clatworthy at internode.on.net-20070807052533-zbcu6ej029i3w5y7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-08-07 07:13:16 +0100
message:
(Ian Clatworthy) Bazaar User Reference
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
------------------------------------------------------------
revno: 2670.1.4.1.2
revision-id: ian.clatworthy at internode.on.net-20070807052533-zbcu6ej029i3w5y7
parent: ian.clatworthy at internode.on.net-20070807035913-opwgnjwrzrei874d
parent: ian.clatworthy at internode.on.net-20070807052434-0ee3s698o4vpk17o
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-08-07 15:25:33 +1000
message:
(Ian Clatworthy) Bazaar User Reference - fix Options case under Python 2.4
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
------------------------------------------------------------
revno: 2666.1.9
revision-id: ian.clatworthy at internode.on.net-20070807052434-0ee3s698o4vpk17o
parent: ian.clatworthy at internode.on.net-20070807035643-axq2x1zr88bm0tax
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.doc-play
timestamp: Tue 2007-08-07 15:24:34 +1000
message:
Fix case of Options in help under Python 2.4
modified:
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
------------------------------------------------------------
revno: 2670.1.4.1.1
revision-id: ian.clatworthy at internode.on.net-20070807035913-opwgnjwrzrei874d
parent: pqm at pqm.ubuntu.com-20070806055227-fzq7gamylj0eo610
parent: ian.clatworthy at internode.on.net-20070807035643-axq2x1zr88bm0tax
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Tue 2007-08-07 13:59:13 +1000
message:
(Ian Clatworthy) Bazaar User Reference
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
------------------------------------------------------------
revno: 2666.1.8
revision-id: ian.clatworthy at internode.on.net-20070807035643-axq2x1zr88bm0tax
parent: ian.clatworthy at internode.on.net-20070807021243-ouf3tx3w2tdjuzcr
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.doc-play
timestamp: Tue 2007-08-07 13:56:43 +1000
message:
Fix storage formats help test
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 2666.1.7
revision-id: ian.clatworthy at internode.on.net-20070807021243-ouf3tx3w2tdjuzcr
parent: ian.clatworthy at internode.on.net-20070807021138-q9u27pdy4wepta7h
parent: pqm at pqm.ubuntu.com-20070806055227-fzq7gamylj0eo610
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.doc-play
timestamp: Tue 2007-08-07 12:12:43 +1000
message:
Merge bzr.dev
added:
bzrlib/_dirstate_helpers_c.h _dirstate_helpers_c.-20070802205935-hqo9yzuzjix271dd-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
------------------------------------------------------------
revno: 2666.1.6
revision-id: ian.clatworthy at internode.on.net-20070807021138-q9u27pdy4wepta7h
parent: ian.clatworthy at internode.on.net-20070807015845-xmkugtrm85gg0h60
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.doc-play
timestamp: Tue 2007-08-07 12:11:38 +1000
message:
Add NEWS item
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 2666.1.5
revision-id: ian.clatworthy at internode.on.net-20070807015845-xmkugtrm85gg0h60
parent: ian.clatworthy at internode.on.net-20070806100213-fos81qqua9epweqv
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.doc-play
timestamp: Tue 2007-08-07 11:58:45 +1000
message:
Incorporate feedback from Alex B. & James W.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
------------------------------------------------------------
revno: 2666.1.4
revision-id: ian.clatworthy at internode.on.net-20070806100213-fos81qqua9epweqv
parent: ian.clatworthy at internode.on.net-20070806091343-hbod2du095rjrtwz
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.doc-play
timestamp: Mon 2007-08-06 20:02:13 +1000
message:
Add help formatting tests
modified:
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
------------------------------------------------------------
revno: 2666.1.3
revision-id: ian.clatworthy at internode.on.net-20070806091343-hbod2du095rjrtwz
parent: ian.clatworthy at internode.on.net-20070806083143-26t03xj031jaf514
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.doc-play
timestamp: Mon 2007-08-06 19:13:43 +1000
message:
Fix man page to show plain text, not reStructuredText
modified:
tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
------------------------------------------------------------
revno: 2666.1.2
revision-id: ian.clatworthy at internode.on.net-20070806083143-26t03xj031jaf514
parent: ian.clatworthy at internode.on.net-20070806082546-oup6ujeleehqoqfj
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.doc-play
timestamp: Mon 2007-08-06 18:31:43 +1000
message:
Update index to refer to Bazaar User Reference instead of man page
modified:
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
------------------------------------------------------------
revno: 2666.1.1
revision-id: ian.clatworthy at internode.on.net-20070806082546-oup6ujeleehqoqfj
parent: pqm at pqm.ubuntu.com-20070801171451-en3tds1hzlru2j83
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.doc-play
timestamp: Mon 2007-08-06 18:25:46 +1000
message:
Bazaar User Reference generated from online help
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help.py help.py-20050505025907-4dd7a6d63912f894
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
------------------------------------------------------------
revno: 2670.1.4
revision-id: pqm at pqm.ubuntu.com-20070806055227-fzq7gamylj0eo610
parent: pqm at pqm.ubuntu.com-20070806040104-af06p8gf7bsb3eze
parent: andrew.bennetts at canonical.com-20070806051155-t570bk2i3gcnebwr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-08-06 06:52:27 +0100
message:
(Andrew Bennetts) Add support for comparing Repositories with == and != operators.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2670.1.1.1.2
revision-id: andrew.bennetts at canonical.com-20070806051155-t570bk2i3gcnebwr
parent: andrew.bennetts at canonical.com-20070806015955-m36ovt3lahluxjzx
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: repository-equality
timestamp: Mon 2007-08-06 15:11:55 +1000
message:
Compare URLs in RemoteRepository.__eq__, rather than '_client' attributes.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
------------------------------------------------------------
revno: 2670.1.1.1.1
revision-id: andrew.bennetts at canonical.com-20070806015955-m36ovt3lahluxjzx
parent: pqm at pqm.ubuntu.com-20070803043116-l7u1uypblmx1uxnr
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: repository-equality
timestamp: Mon 2007-08-06 11:59:55 +1000
message:
Add support for comparing Repositories with == and != operators.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 2670.1.3
revision-id: pqm at pqm.ubuntu.com-20070806040104-af06p8gf7bsb3eze
parent: pqm at pqm.ubuntu.com-20070806023139-97nrt9mu4qihcdf3
parent: michael.hudson at canonical.com-20070801083824-k2wh3mt9uy1walu9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-08-06 05:01:04 +0100
message:
(robertc) Merge Michael Hudson's merge --weave --show-base error output fix. (Michael Hudson)
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 2665.2.1
revision-id: michael.hudson at canonical.com-20070801083824-k2wh3mt9uy1walu9
parent: pqm at pqm.ubuntu.com-20070801000518-wyeivv59zhkh9cbp
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: nameerror-in-merge
timestamp: Wed 2007-08-01 09:38:24 +0100
message:
test and fix for a NameError in merge --weave --show-base
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
------------------------------------------------------------
revno: 2670.1.2
revision-id: pqm at pqm.ubuntu.com-20070806023139-97nrt9mu4qihcdf3
parent: pqm at pqm.ubuntu.com-20070803043116-l7u1uypblmx1uxnr
parent: michael.hudson at canonical.com-20070801153837-ytpslegafe8jga9d
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-08-06 03:31:39 +0100
message:
(robertc) Merge Michael Hudson's run_bzr keyword usage fix. (Michael Hudson)
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
------------------------------------------------------------
revno: 2665.1.2
revision-id: michael.hudson at canonical.com-20070801153837-ytpslegafe8jga9d
parent: michael.hudson at canonical.com-20070801085940-940rk4rh3n0hzh1a
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: stricter-run_bzr
timestamp: Wed 2007-08-01 16:38:37 +0100
message:
as jam suggested, report all extra keywords
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2665.1.1
revision-id: michael.hudson at canonical.com-20070801085940-940rk4rh3n0hzh1a
parent: pqm at pqm.ubuntu.com-20070801000518-wyeivv59zhkh9cbp
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: stricter-run_bzr
timestamp: Wed 2007-08-01 09:59:40 +0100
message:
make run_bzr stricter about the keyword arguments it takes.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
------------------------------------------------------------
revno: 2670.1.1
revision-id: pqm at pqm.ubuntu.com-20070803043116-l7u1uypblmx1uxnr
parent: pqm at pqm.ubuntu.com-20070802221338-9333q05a8caaciwo
parent: robertc at robertcollins.net-20070803010718-4grgme3fuhpaoatl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-08-03 05:31:16 +0100
message:
(robertc) Do not test for " " in the file_id_involved repository tests. (Robert Collins).
modified:
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
------------------------------------------------------------
revno: 2670.2.1
revision-id: robertc at robertcollins.net-20070803010718-4grgme3fuhpaoatl
parent: pqm at pqm.ubuntu.com-20070802221338-9333q05a8caaciwo
committer: Robert Collins <robertc at robertcollins.net>
branch nick: fileids.patch
timestamp: Fri 2007-08-03 11:07:18 +1000
message:
Remove the use of file_ids with spaces in the fileid_involved tests.
modified:
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
Diff too large for email (3310 lines, the limit is 1000).
More information about the bazaar-commits
mailing list