Rev 4610: merge bzr.dev into cleanup in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4610 [merge]
revision-id: v.ladeuil+lp at free.fr-20091210170348-k0upv6axibr04cbf
parent: v.ladeuil+lp at free.fr-20091027161920-jl3yjei5b0zwupj2
parent: pqm at pqm.ubuntu.com-20091210164716-e18k2to740e9eq7s
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Thu 2009-12-10 18:03:48 +0100
message:
  merge bzr.dev into cleanup
removed:
  bzrlib/textui.py               textui.py-20050309040759-5d0cebe09c528e7d
added:
  bzrlib/cleanup.py              cleanup.py-20090922032110-mv6i6y8t04oon9np-1
  bzrlib/tests/per_foreign_vcs/test_repository.py test_repository.py-20091014092330-i5ymtg1r2o8quut9-1
  bzrlib/tests/test_cleanup.py   test_cleanup.py-20090922032110-mv6i6y8t04oon9np-2
  bzrlib/tests/test_patches_data/binary-after-normal.patch binaryafternormal.pa-20091103153908-9xu6wqrosgnjzk8e-1
  doc/developers/_static/bzr-doc.css bzrdoc.css-20091118014608-u0t1h53l2t81rir3-2
  doc/developers/contribution-quickstart.txt contributionquicksta-20091118014608-u0t1h53l2t81rir3-1
  doc/developers/win32_build_setup.txt win32_build_setup.tx-20091104201959-pvlau2f8dndoxjj8-1
  doc/en/admin-guide/advanced.txt advanced.txt-20091205144603-lgpl0e0z6lzk2rdw-1
  doc/en/admin-guide/backup.txt  backup.txt-20091205144603-lgpl0e0z6lzk2rdw-2
  doc/en/admin-guide/code-browsing.txt codebrowsing.txt-20091205144603-lgpl0e0z6lzk2rdw-3
  doc/en/admin-guide/hooks-plugins.txt hooksplugins.txt-20091205144603-lgpl0e0z6lzk2rdw-5
  doc/en/admin-guide/index-plain.txt indexplain.txt-20091207173249-l6b7b8lzol70mol0-1
  doc/en/admin-guide/integration.txt integration.txt-20091205144603-lgpl0e0z6lzk2rdw-6
  doc/en/admin-guide/introduction.txt introduction.txt-20091205144603-lgpl0e0z6lzk2rdw-7
  doc/en/admin-guide/migration.txt migration.txt-20091205144603-lgpl0e0z6lzk2rdw-8
  doc/en/admin-guide/other-setups.txt othersetups.txt-20091205144603-lgpl0e0z6lzk2rdw-9
  doc/en/admin-guide/security.txt security.txt-20091205144603-lgpl0e0z6lzk2rdw-10
  doc/en/admin-guide/simple-setups.txt simplesetups.txt-20091205144603-lgpl0e0z6lzk2rdw-11
  doc/en/admin-guide/upgrade.txt upgrade.txt-20091205144603-lgpl0e0z6lzk2rdw-12
  doc/index.ja.txt               index.ja.txt-20091029100035-1rni8rgpen0pe1g2-2
  doc/ja/                        ja-20091029100035-1rni8rgpen0pe1g2-1
  doc/ja/_static/                _static-20091029100035-1rni8rgpen0pe1g2-3
  doc/ja/_static/bzr icon 16.png bzricon16.png-20091029100035-1rni8rgpen0pe1g2-13
  doc/ja/_static/bzr.ico         bzr.ico-20091029100035-1rni8rgpen0pe1g2-14
  doc/ja/_templates/             _templates-20091029100035-1rni8rgpen0pe1g2-4
  doc/ja/conf.py                 conf.py-20091029100035-1rni8rgpen0pe1g2-10
  doc/ja/index.txt               index.txt-20091029100035-1rni8rgpen0pe1g2-11
  doc/ja/mini-tutorial/          minitutorial-20091029100035-1rni8rgpen0pe1g2-5
  doc/ja/mini-tutorial/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-15
  doc/ja/tutorials/              tutorials-20091029100035-1rni8rgpen0pe1g2-6
  doc/ja/tutorials/centralized_workflow.txt centralized_workflow-20091029100035-1rni8rgpen0pe1g2-16
  doc/ja/tutorials/index.txt     index.txt-20091029100035-1rni8rgpen0pe1g2-17
  doc/ja/tutorials/tutorial.txt  tutorial.txt-20091029100035-1rni8rgpen0pe1g2-18
  doc/ja/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_la-20091029100035-1rni8rgpen0pe1g2-19
  doc/ja/upgrade-guide/          upgradeguide-20091029100035-1rni8rgpen0pe1g2-7
  doc/ja/upgrade-guide/data_migration.txt data_migration.txt-20091029100035-1rni8rgpen0pe1g2-20
  doc/ja/upgrade-guide/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-21
  doc/ja/upgrade-guide/overview.txt overview.txt-20091029100035-1rni8rgpen0pe1g2-22
  doc/ja/upgrade-guide/tips_and_tricks.txt tips_and_tricks.txt-20091029100035-1rni8rgpen0pe1g2-23
  doc/ja/user-guide/             userguide-20091029100035-1rni8rgpen0pe1g2-8
  doc/ja/user-guide/adv_merging.txt adv_merging.txt-20091029100035-1rni8rgpen0pe1g2-25
  doc/ja/user-guide/annotating_changes.txt annotating_changes.t-20091029100035-1rni8rgpen0pe1g2-26
  doc/ja/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20091029100035-1rni8rgpen0pe1g2-27
  doc/ja/user-guide/branching_a_project.txt branching_a_project.-20091029100035-1rni8rgpen0pe1g2-28
  doc/ja/user-guide/browsing_history.txt browsing_history.txt-20091029100035-1rni8rgpen0pe1g2-29
  doc/ja/user-guide/bug_trackers.txt bug_trackers.txt-20091029100035-1rni8rgpen0pe1g2-30
  doc/ja/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20091029100035-1rni8rgpen0pe1g2-31
  doc/ja/user-guide/central_intro.txt central_intro.txt-20091029100035-1rni8rgpen0pe1g2-32
  doc/ja/user-guide/configuring_bazaar.txt configuring_bazaar.t-20091029100035-1rni8rgpen0pe1g2-33
  doc/ja/user-guide/controlling_registration.txt controlling_registra-20091029100035-1rni8rgpen0pe1g2-34
  doc/ja/user-guide/core_concepts.txt core_concepts.txt-20091029100035-1rni8rgpen0pe1g2-35
  doc/ja/user-guide/distributed_intro.txt distributed_intro.tx-20091029100035-1rni8rgpen0pe1g2-36
  doc/ja/user-guide/entering_commands.txt entering_commands.tx-20091029100035-1rni8rgpen0pe1g2-37
  doc/ja/user-guide/filtered_views.txt filtered_views.txt-20091029100035-1rni8rgpen0pe1g2-38
  doc/ja/user-guide/getting_help.txt getting_help.txt-20091029100035-1rni8rgpen0pe1g2-39
  doc/ja/user-guide/hooks.txt    hooks.txt-20091029100035-1rni8rgpen0pe1g2-40
  doc/ja/user-guide/http_smart_server.txt http_smart_server.tx-20091029100035-1rni8rgpen0pe1g2-41
  doc/ja/user-guide/images/      images-20091029100035-1rni8rgpen0pe1g2-24
  doc/ja/user-guide/images/workflows_centralized.png workflows_centralize-20091029100035-1rni8rgpen0pe1g2-77
  doc/ja/user-guide/images/workflows_centralized.svg workflows_centralize-20091029100035-1rni8rgpen0pe1g2-78
  doc/ja/user-guide/images/workflows_gatekeeper.png workflows_gatekeeper-20091029100035-1rni8rgpen0pe1g2-79
  doc/ja/user-guide/images/workflows_gatekeeper.svg workflows_gatekeeper-20091029100035-1rni8rgpen0pe1g2-80
  doc/ja/user-guide/images/workflows_localcommit.png workflows_localcommi-20091029100035-1rni8rgpen0pe1g2-81
  doc/ja/user-guide/images/workflows_localcommit.svg workflows_localcommi-20091029100035-1rni8rgpen0pe1g2-82
  doc/ja/user-guide/images/workflows_peer.png workflows_peer.png-20091029100035-1rni8rgpen0pe1g2-83
  doc/ja/user-guide/images/workflows_peer.svg workflows_peer.svg-20091029100035-1rni8rgpen0pe1g2-84
  doc/ja/user-guide/images/workflows_pqm.png workflows_pqm.png-20091029100035-1rni8rgpen0pe1g2-85
  doc/ja/user-guide/images/workflows_pqm.svg workflows_pqm.svg-20091029100035-1rni8rgpen0pe1g2-86
  doc/ja/user-guide/images/workflows_shared.png workflows_shared.png-20091029100035-1rni8rgpen0pe1g2-87
  doc/ja/user-guide/images/workflows_shared.svg workflows_shared.svg-20091029100035-1rni8rgpen0pe1g2-88
  doc/ja/user-guide/images/workflows_single.png workflows_single.png-20091029100035-1rni8rgpen0pe1g2-89
  doc/ja/user-guide/images/workflows_single.svg workflows_single.svg-20091029100035-1rni8rgpen0pe1g2-90
  doc/ja/user-guide/index.txt    index.txt-20091029100035-1rni8rgpen0pe1g2-42
  doc/ja/user-guide/installing_bazaar.txt installing_bazaar.tx-20091029100035-1rni8rgpen0pe1g2-43
  doc/ja/user-guide/introducing_bazaar.txt introducing_bazaar.t-20091029100035-1rni8rgpen0pe1g2-44
  doc/ja/user-guide/merging_changes.txt merging_changes.txt-20091029100035-1rni8rgpen0pe1g2-45
  doc/ja/user-guide/organizing_branches.txt organizing_branches.-20091029100035-1rni8rgpen0pe1g2-46
  doc/ja/user-guide/organizing_your_workspace.txt organizing_your_work-20091029100035-1rni8rgpen0pe1g2-47
  doc/ja/user-guide/part2_intro.txt part2_intro.txt-20091029100035-1rni8rgpen0pe1g2-48
  doc/ja/user-guide/partner_intro.txt partner_intro.txt-20091029100035-1rni8rgpen0pe1g2-49
  doc/ja/user-guide/plugins.txt  plugins.txt-20091029100035-1rni8rgpen0pe1g2-50
  doc/ja/user-guide/publishing_a_branch.txt publishing_a_branch.-20091029100035-1rni8rgpen0pe1g2-51
  doc/ja/user-guide/recording_changes.txt recording_changes.tx-20091029100035-1rni8rgpen0pe1g2-52
  doc/ja/user-guide/releasing_a_project.txt releasing_a_project.-20091029100035-1rni8rgpen0pe1g2-53
  doc/ja/user-guide/resolving_conflicts.txt resolving_conflicts.-20091029100035-1rni8rgpen0pe1g2-54
  doc/ja/user-guide/reusing_a_checkout.txt reusing_a_checkout.t-20091029100035-1rni8rgpen0pe1g2-55
  doc/ja/user-guide/reviewing_changes.txt reviewing_changes.tx-20091029100035-1rni8rgpen0pe1g2-56
  doc/ja/user-guide/sending_changes.txt sending_changes.txt-20091029100035-1rni8rgpen0pe1g2-57
  doc/ja/user-guide/server.txt   server.txt-20091029100035-1rni8rgpen0pe1g2-58
  doc/ja/user-guide/setting_up_email.txt setting_up_email.txt-20091029100035-1rni8rgpen0pe1g2-59
  doc/ja/user-guide/shared_repository_layouts.txt shared_repository_la-20091029100035-1rni8rgpen0pe1g2-60
  doc/ja/user-guide/shelving_changes.txt shelving_changes.txt-20091029100035-1rni8rgpen0pe1g2-61
  doc/ja/user-guide/solo_intro.txt solo_intro.txt-20091029100035-1rni8rgpen0pe1g2-62
  doc/ja/user-guide/specifying_revisions.txt specifying_revisions-20091029100035-1rni8rgpen0pe1g2-63
  doc/ja/user-guide/stacked.txt  stacked.txt-20091029100035-1rni8rgpen0pe1g2-64
  doc/ja/user-guide/starting_a_project.txt starting_a_project.t-20091029100035-1rni8rgpen0pe1g2-65
  doc/ja/user-guide/svn_plugin.txt svn_plugin.txt-20091029100035-1rni8rgpen0pe1g2-66
  doc/ja/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20091029100035-1rni8rgpen0pe1g2-67
  doc/ja/user-guide/using_aliases.txt using_aliases.txt-20091029100035-1rni8rgpen0pe1g2-68
  doc/ja/user-guide/using_checkouts.txt using_checkouts.txt-20091029100035-1rni8rgpen0pe1g2-69
  doc/ja/user-guide/using_gatekeepers.txt using_gatekeepers.tx-20091029100035-1rni8rgpen0pe1g2-70
  doc/ja/user-guide/version_info.txt version_info.txt-20091029100035-1rni8rgpen0pe1g2-71
  doc/ja/user-guide/web_browsing.txt web_browsing.txt-20091029100035-1rni8rgpen0pe1g2-72
  doc/ja/user-guide/working_offline_central.txt working_offline_cent-20091029100035-1rni8rgpen0pe1g2-73
  doc/ja/user-guide/writing_a_plugin.txt writing_a_plugin.txt-20091029100035-1rni8rgpen0pe1g2-74
  doc/ja/user-guide/zen.txt      zen.txt-20091029100035-1rni8rgpen0pe1g2-75
  doc/ja/user-reference/         userreference-20091029100035-1rni8rgpen0pe1g2-9
  doc/ja/user-reference/index.txt index.txt-20091029100035-1rni8rgpen0pe1g2-76
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/_btree_serializer_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
  bzrlib/_groupcompress_pyx.pyx  _groupcompress_c.pyx-20080724041824-yelg6ii7c7zxt4z0-1
  bzrlib/_known_graph_py.py      _known_graph_py.py-20090610185421-vw8vfda2cgnckgb1-1
  bzrlib/_known_graph_pyx.pyx    _known_graph_pyx.pyx-20090610194911-yjk73td9hpjilas0-1
  bzrlib/_patiencediff_c.c       _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
  bzrlib/_static_tuple_c.c       _keys_type_c.c-20090908204220-aa346ccw4l37jzt7-1
  bzrlib/_static_tuple_py.py     _keys_type_py.py-20090908213415-o1ww98k9a8aqm0bm-1
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/chk_map.py              chk_map.py-20081001014447-ue6kkuhofvdecvxa-1
  bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  bzrlib/export/zip_exporter.py  zip_exporter.py-20051114235828-8f57f954fba6497e
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
  bzrlib/globbing.py             glob.py-20061113075651-q63o2v35fm2ydk9x-1
  bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
  bzrlib/groupcompress.py        groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
  bzrlib/help.py                 help.py-20050505025907-4dd7a6d63912f894
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
  bzrlib/help_topics/en/debug-flags.txt debugflags.txt-20090312050229-rdspqbqq4fzbjtpe-1
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
  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/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/patches.py              patches.py-20050727183609-378c1cc5972ce908
  bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
  bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
  bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
  bzrlib/plugins/launchpad/test_lp_open.py test_lp_open.py-20090125174355-hxrsxh3sj84225qu-1
  bzrlib/push.py                 push.py-20080606021927-5fe39050e8xne9un-1
  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/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/shelf_ui.py             shelver.py-20081005210102-33worgzwrtdw0yrm-1
  bzrlib/shellcomplete.py        shellcomplete.py-20050822153127-3be115ff5e70fc39
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/smart/vfs.py            vfs.py-20061108095550-gunadhxmzkdjfeek-2
  bzrlib/static_tuple.py         static_tuple.py-20091012195926-qa7zh2stf4xtblm8-1
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
  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_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
  bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
  bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
  bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
  bzrlib/tests/per_branch/test_iter_merge_sorted_revisions.py test_merge_sorted_re-20090121004847-to3gvjwigstu93eh-1
  bzrlib/tests/per_branch/test_parent.py test_parent.py-20050830052751-5e62766623c32222
  bzrlib/tests/per_bzrdir/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/per_foreign_vcs/__init__.py __init__.py-20090804140647-lrnof6q71eti9buc-2
  bzrlib/tests/per_intertree/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
  bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
  bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/per_tree/test_get_file_with_stat.py test_get_file_with_s-20080922035909-lhdovrr36jpxmu0v-1
  bzrlib/tests/per_tree/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
  bzrlib/tests/per_tree/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
  bzrlib/tests/per_uifactory/__init__.py __init__.py-20090923045301-o12zypjwsidxn2hy-1
  bzrlib/tests/per_workingtree/test_content_filters.py test_content_filters-20080424071441-8navsrmrfdxpn90a-1
  bzrlib/tests/per_workingtree/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
  bzrlib/tests/per_workingtree/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/tests/script.py         script.py-20090901081155-yk3tiy1nunxg16ne-1
  bzrlib/tests/ssl_certs/create_ssls.py create_ssls.py-20071124141703-j5hr254lm287lyut-5
  bzrlib/tests/ssl_certs/server.crt server.crt-20071124141703-j5hr254lm287lyut-4
  bzrlib/tests/ssl_certs/server.csr server.csr-20071124141703-j5hr254lm287lyut-3
  bzrlib/tests/ssl_certs/server_with_pass.key server_with_pass.key-20071124141703-j5hr254lm287lyut-2
  bzrlib/tests/ssl_certs/server_without_pass.key server_without_pass.-20071124141703-j5hr254lm287lyut-1
  bzrlib/tests/test__dirstate_helpers.py test_dirstate_helper-20070504035751-jsbn00xodv0y1eve-2
  bzrlib/tests/test__known_graph.py test__known_graph.py-20090610185421-vw8vfda2cgnckgb1-2
  bzrlib/tests/test__static_tuple.py test__keys_type.py-20090908204220-aa346ccw4l37jzt7-2
  bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
  bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
  bzrlib/tests/test_globbing.py  test_glob.py-20061113075651-q63o2v35fm2ydk9x-2
  bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
  bzrlib/tests/test_hooks.py     test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_index.py     test_index.py-20070712131115-lolkarso50vjr64s-2
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
  bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_patches.py   test_patches.py-20051231203844-f4974d20f6aea09c
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_script.py    test_script.py-20090901081156-y90z4w2t62fv7e7b-1
  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_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
  bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/tests/test_ui.py        test_ui.py-20051130162854-458e667a7414af09
  bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
  bzrlib/tests/test_version.py   test_version.py-20060816024207-ves6ult9a11taj9t-2
  bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
  bzrlib/ui/text.py              text.py-20051130153916-2e438cffc8afc478
  bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
  bzrlib/util/_bencode_py.py     bencode.py-20070220044742-sltr28q21w2wzlxi-1
  bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
  bzrlib/version_info_formats/format_rio.py format_rio.py-20060809202444-ike7i9ub03gb432p-2
  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/default.css                default.css-20060622101119-tgwtdci8z769bjb9-1
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
  doc/developers/_templates/layout.html layout.html-20090907074245-4b4pm5q3bjw2pt27-1
  doc/developers/add.txt         add.txt-20070515094933-xhgz3xjc7o0edok0-2
  doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
  doc/developers/apport.txt      apport.txt-20090812083313-9nz21aq6dtwv7hmm-1
  doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
  doc/developers/bug-handling.txt bughandling.txt-20090615072247-mplym00zjq2n4s61-1
  doc/developers/bundles.txt     bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
  doc/developers/case-insensitive-file-systems.txt caseinsensitivefiles-20081117224243-p84xpmqnsa1p8k91-1
  doc/developers/colocated-branches.txt colocatedbranches.tx-20090209183539-wv9upczfd8ryyfn1-1
  doc/developers/commit.txt      performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
  doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
  doc/developers/content-filtering.txt contentfiltering.txt-20090825034801-16mynkm76jpmi4tp-1
  doc/developers/cycle.txt       cycle.txt-20081017031739-rw24r0cywm2ok3xu-1
  doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
  doc/developers/diff.txt        diff.txt-20070716233605-2q6jzorua7mr42jk-1
  doc/developers/directory-fingerprints.txt directoryfingerprint-20070731033348-okmllh4b5srdtlk2-1
  doc/developers/ec2.txt         ec2windows.txt-20090219062112-2ga0nqpcm7n02njf-1
  doc/developers/improved_chk_index.txt improved_chk_index.t-20090320211430-odgus43a7wgoi0ik-1
  doc/developers/incremental-push-pull.txt incrementalpushpull.-20070508045640-zneiu1yzbci574c6-1
  doc/developers/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-1
  doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
  doc/developers/inventory.txt   inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
  doc/developers/last-modified.txt lastmodified.txt-20070806222243-df50y5fi7n85vnob-1
  doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
  doc/developers/overview.txt    overview.txt-20080904022501-ww2ggomrs5elxfm0-1
  doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
  doc/developers/planned-change-integration.txt plannedchangeintegra-20070619004702-i1b3ccamjtfaoq6w-1
  doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
  doc/developers/plans.txt       plans.txt-20090907074210-zula633ky077z6vu-8
  doc/developers/plugin-api.txt  pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
  doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
  doc/developers/process.txt     process.txt-20090907074210-zula633ky077z6vu-9
  doc/developers/profiling.txt   profiling.txt-20070531045713-j15mxufywgzwdeu8-1
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
  doc/developers/repository-stream.txt repositorystream.txt-20080410222511-nh6b9bvscvcerh48-1
  doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
  doc/developers/revert.txt      revert.txt-20070515111013-grc9hgp21zxqbwbl-1
  doc/developers/specifications.txt specifications.txt-20090907074210-zula633ky077z6vu-10
  doc/developers/status.txt      status.txt-20070702023117-6xss29lx170qndwr-1
  doc/developers/testing.txt     testing.txt-20080812140359-i70zzh6v2z7grqex-1
  doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
  doc/developers/update.txt      update.txt-20070713074325-vtxf9eb5c6keg30j-1
  doc/en/_templates/index.html   index.html-20090722133849-lus2rzwsmlhpgqhv-1
  doc/en/_templates/layout.html  layout.html-20090722133849-lus2rzwsmlhpgqhv-2
  doc/en/admin-guide/index.txt   index.txt-20080305140741-ecw0lap8dxkxc05g-1
  doc/en/conf.py                 conf.py-20090722133816-63ik5s6s5gsnz7zy-12
  doc/en/index.txt               contents.txt-20090722133816-63ik5s6s5gsnz7zy-13
  doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
  doc/en/tutorials/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
  doc/en/tutorials/tutorial.txt  tutorial.txt-20050804190939-9dcbba2ef053bc84
  doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
  doc/en/user-guide/adv_merging.txt adv_merging.txt-20071213070245-d7u7150lb2hhnvby-1
  doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
  doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
  doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
  doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
  doc/en/user-guide/distributed_intro.txt distributed_intro.tx-20071123154453-dk2mjhrg1vpjm5w2-2
  doc/en/user-guide/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
  doc/en/user-guide/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-2
  doc/en/user-guide/index.txt    indexfor2x.txt-20090722150335-qt9yh29f930m4v0r-1
  doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
  doc/en/user-guide/plugins.txt  plugins.txt-20060314145616-525099a747f3ffdd
  doc/en/user-guide/publishing_a_branch.txt publishing_a_branch.-20071123055134-k5x4ekduci2lbn36-2
  doc/en/user-guide/recording_changes.txt recording_changes.tx-20071121073725-0corxykv5irjal00-4
  doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
  doc/en/user-guide/reviewing_changes.txt reviewing_changes.tx-20071121073725-0corxykv5irjal00-6
  doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
  doc/en/user-guide/server.txt   server.txt-20060913044801-h939fvbwzz39gf7g-1
  doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
  doc/en/user-guide/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
  doc/en/user-guide/shelving_changes.txt shelving_changes.txt-20090312060214-kfn9smg37syy9kcl-1
  doc/en/user-guide/specifying_revisions.txt specifying_revisions.txt-20060314161707-19deb139101bea33
  doc/en/user-guide/stacked.txt  stacked.txt-20080711023247-4uh9oovoka0sze8b-1
  doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
  doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
  doc/en/user-guide/web_browsing.txt web_browsing.txt-20080509065016-cjc90f46407vi9a0-3
  doc/en/user-guide/zen.txt      revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
  doc/es/_templates/layout.html  layout.html-20090907060608-h0yq9dbax4xt09v5-1
  doc/es/index.txt               index.es.txt-20080506002113-aunzdhptcoc0h6hm-1
  doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
  doc/es/user-guide/index-plain.txt indexplain.txt-20090909124424-llpj39uuk9509qhi-1
  doc/es/user-guide/index.txt    index.txt-20080512005856-hgdxkh9xo58n7zdp-2
  doc/es/user-guide/resolving_conflicts.txt conflicts.txt-20080504181626-aqnzjwfhpju5ypfe-1
  doc/es/user-guide/version_info.txt version_info.txt-20080504181730-u24nugzokrcrk1bf-1
  doc/index.es.txt               index.es.txt-20090909123806-96yfsgrqwra8cwq7-3
  doc/index.ru.txt               index.ru.txt-20090909123806-96yfsgrqwra8cwq7-4
  doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
  doc/ru/_templates/layout.html  layout.html-20090908150437-pppigv0c2cky3qbk-1
  doc/ru/index.txt               index.ru.txt-20080819091426-kfq61l02dhm9pplk-1
  doc/ru/mini-tutorial/index.txt index.txt-20080818031309-t3nyctvfbvfh4h2u-4
  doc/ru/tutorials/centralized_workflow.txt centralized_workflow-20090531190825-ex3ums4bcuaf2r6k-1
  doc/ru/tutorials/tutorial.txt  tutorial.txt-20090602180629-wkp7wr27jl4i2zep-1
  doc/ru/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_la-20090427084917-b22ppqtdx7q4hapw-1
  doc/ru/user-guide/branching_a_project.txt branching_a_project.-20090602104644-pjpwfx7xh2k5l0ba-1
  doc/ru/user-guide/index-plain.txt indexplain.txt-20090909124424-llpj39uuk9509qhi-2
  doc/ru/user-guide/index.txt    index.txt-20090601201124-cruf3mmq5cfxeb1w-2
  doc/ru/user-guide/introducing_bazaar.txt introducing_bazaar.t-20090601221109-6ehwbt2pvzgpftlu-1
  doc/ru/user-guide/specifying_revisions.txt specifying_revisions-20090602104644-pjpwfx7xh2k5l0ba-3
  doc/ru/user-guide/zen.txt      zen.txt-20090602104644-pjpwfx7xh2k5l0ba-6
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
-------------- next part --------------

Diff too large for email (41115 lines, the limit is 1000).