Rev 5349: Merge bzr.dev into deprecate-get-filename in file:///home/vila/src/bzr/bugs/525571-lock-bazaar-conf-files/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/525571-lock-bazaar-conf-files/

------------------------------------------------------------
revno: 5349 [merge]
revision-id: v.ladeuil+lp at free.fr-20100721150007-a2jwqqaz9a3slgc3
parent: v.ladeuil+lp at free.fr-20100719094517-i786ls9sbw2mpbmu
parent: pqm at pqm.ubuntu.com-20100721145413-0t39loftbuv8yk2f
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: deprecate-get-filename
timestamp: Wed 2010-07-21 17:00:07 +0200
message:
  Merge bzr.dev into deprecate-get-filename
added:
  bzrlib/doc_generate/builders/  bzrlibdoc_generatebu-20100428165216-u9zn4jkzna43f5br-1
  bzrlib/doc_generate/builders/__init__.py __init__.py-20100429154052-obn9puc6h4srmfqf-1
  bzrlib/doc_generate/builders/texinfo.py texinfo_builder.py-20100428165122-t24toqlqz1nxzsc0-1
  bzrlib/doc_generate/writers/   bzrlibdoc_generatewr-20100428165220-eatkszxh2odj369n-1
  bzrlib/doc_generate/writers/__init__.py __init__.py-20100429154053-q5ci11imur20p4up-1
  bzrlib/doc_generate/writers/texinfo.py texinfo_writer.py-20100428165123-pgxf99nm4uc2iux4-1
  bzrlib/tests/doc_generate/     doc_generate-20100429145829-nbgcdpmh32opmxzm-1
  bzrlib/tests/doc_generate/__init__.py __init__.py-20100429153409-fpdr7jznxqojupd2-1
  bzrlib/tests/doc_generate/builders/ builders-20100429153410-zb0jsypqgsx9zzrp-1
  bzrlib/tests/doc_generate/builders/__init__.py __init__.py-20100429153416-pdpzy6hluos6jhyu-1
  bzrlib/tests/doc_generate/builders/test_texinfo.py test_texinfo.py-20100429153416-rrbyt0aljyz1mgl8-1
  bzrlib/tests/doc_generate/writers/ writers-20100706132137-6181ylqj6hcxrc5s-1
  bzrlib/tests/doc_generate/writers/__init__.py __init__.py-20100706132147-3ilw5s1xjjsrvqil-1
  bzrlib/tests/doc_generate/writers/test_texinfo.py test_texinfo.py-20100706132149-5xascqycp14tbyci-1
  bzrlib/tests/per_workingtree/test_symlinks.py test_symlinks.py-20100715135626-4lw38d8njbzyec6l-1
  bzrlib/tests/test_treeshape.py test_treeshape.py-20100715135036-z8vz2u7f3w7wg2it-1
  doc/developers/transports.txt  transports.txt-20100716091505-sd18bmz2c3t8qold-1
renamed:
  bzrlib/doc_generate/sphinx_conf.py => bzrlib/doc_generate/conf.py sphinx_conf.py-20090908163544-ajoym05j0fmvn3sh-1
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
  bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
  bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/help_topics/en/conflict-types.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/shelf_ui.py             shelver.py-20081005210102-33worgzwrtdw0yrm-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
  bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
  bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
  bzrlib/tests/features.py       features.py-20090820042958-jglgza3wrn03ha9e-1
  bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
  bzrlib/tests/per_transport.py  test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/per_workingtree/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tests/per_workingtree/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
  bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
  bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
  bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
  bzrlib/tests/treeshape.py      treeshape.py-20051004094628-312a98f0194306a8
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  doc/developers/conf.py         conf.py-20090907074210-zula633ky077z6vu-4
  doc/developers/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-1
  doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
  doc/developers/testing.txt     testing.txt-20080812140359-i70zzh6v2z7grqex-1
  doc/en/Makefile                makefile-20090722133816-63ik5s6s5gsnz7zy-11
  doc/en/conf.py                 conf.py-20090722133816-63ik5s6s5gsnz7zy-12
  doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
  doc/es/conf.py                 conf.py-20090907035530-u1c4vkpj8ki76jbr-4
  doc/ja/conf.py                 conf.py-20091029100035-1rni8rgpen0pe1g2-10
  doc/ru/conf.py                 conf.py-20090907052526-fe9f0itd9ikgtasa-4
  tools/generate_release_notes.py generate_release_not-20090903045433-6vjlqni6dfgv2ekv-1
  bzrlib/doc_generate/conf.py    sphinx_conf.py-20090908163544-ajoym05j0fmvn3sh-1
-------------- next part --------------

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