Rev 5453: Merge config-modify into next in file:///home/vila/src/bzr/experimental/config/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/config/

------------------------------------------------------------
revno: 5453 [merge]
revision-id: v.ladeuil+lp at free.fr-20101015093435-s41rdegikvgkg53n
parent: v.ladeuil+lp at free.fr-20101013103817-9p4kw0udyee1oexm
parent: v.ladeuil+lp at free.fr-20101015093433-3rtdmpq8pdkc7reg
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: next
timestamp: Fri 2010-10-15 11:34:35 +0200
message:
  Merge config-modify into next
added:
  NEWS                           news-20101007064822-9uc24dsvwuur6mzs-1
  doc/developers/documenting-changes.txt documentingchanges.t-20101013040916-yk0dmle751kjoprm-1
  doc/en/release-notes/bzr-0.1.txt bzr0.1.txt-20101008081016-21wd86gpfhllpue3-1
  doc/en/release-notes/bzr-0.10.txt bzr0.10.txt-20101008081016-21wd86gpfhllpue3-2
  doc/en/release-notes/bzr-0.11.txt bzr0.11.txt-20101008081016-21wd86gpfhllpue3-3
  doc/en/release-notes/bzr-0.12.txt bzr0.12.txt-20101008081016-21wd86gpfhllpue3-4
  doc/en/release-notes/bzr-0.13.txt bzr0.13.txt-20101008081016-21wd86gpfhllpue3-5
  doc/en/release-notes/bzr-0.14.txt bzr0.14.txt-20101008081016-21wd86gpfhllpue3-6
  doc/en/release-notes/bzr-0.15.txt bzr0.15.txt-20101008081016-21wd86gpfhllpue3-7
  doc/en/release-notes/bzr-0.16.txt bzr0.16.txt-20101008081016-21wd86gpfhllpue3-8
  doc/en/release-notes/bzr-0.17.txt bzr0.17.txt-20101008081016-21wd86gpfhllpue3-9
  doc/en/release-notes/bzr-0.18.txt bzr0.18.txt-20101008081016-21wd86gpfhllpue3-10
  doc/en/release-notes/bzr-0.6.txt bzr0.6.txt-20101008081016-21wd86gpfhllpue3-11
  doc/en/release-notes/bzr-0.7.txt bzr0.7.txt-20101008081016-21wd86gpfhllpue3-12
  doc/en/release-notes/bzr-0.8.txt bzr0.8.txt-20101008081016-21wd86gpfhllpue3-13
  doc/en/release-notes/bzr-0.9.txt bzr0.9.txt-20101008081016-21wd86gpfhllpue3-14
  doc/en/release-notes/bzr-0.90.txt bzr0.90.txt-20101008081016-21wd86gpfhllpue3-15
  doc/en/release-notes/bzr-0.91.txt bzr0.91.txt-20101008081016-21wd86gpfhllpue3-16
  doc/en/release-notes/bzr-0.92.txt bzr0.92.txt-20101008081016-21wd86gpfhllpue3-17
  doc/en/release-notes/bzr-1.0.txt bzr1.0.txt-20101008081016-21wd86gpfhllpue3-18
  doc/en/release-notes/bzr-1.1.txt bzr1.1.txt-20101008081016-21wd86gpfhllpue3-19
  doc/en/release-notes/bzr-1.10.txt bzr1.10.txt-20101008081016-21wd86gpfhllpue3-20
  doc/en/release-notes/bzr-1.11.txt bzr1.11.txt-20101008081016-21wd86gpfhllpue3-21
  doc/en/release-notes/bzr-1.12.txt bzr1.12.txt-20101008081016-21wd86gpfhllpue3-22
  doc/en/release-notes/bzr-1.13.txt bzr1.13.txt-20101008081016-21wd86gpfhllpue3-23
  doc/en/release-notes/bzr-1.14.txt bzr1.14.txt-20101008081016-21wd86gpfhllpue3-24
  doc/en/release-notes/bzr-1.15.txt bzr1.15.txt-20101008081016-21wd86gpfhllpue3-25
  doc/en/release-notes/bzr-1.16.txt bzr1.16.txt-20101008081016-21wd86gpfhllpue3-26
  doc/en/release-notes/bzr-1.17.txt bzr1.17.txt-20101008081016-21wd86gpfhllpue3-27
  doc/en/release-notes/bzr-1.18.txt bzr1.18.txt-20101008081016-21wd86gpfhllpue3-28
  doc/en/release-notes/bzr-1.2.txt bzr1.2.txt-20101008081016-21wd86gpfhllpue3-29
  doc/en/release-notes/bzr-1.3.txt bzr1.3.txt-20101008081016-21wd86gpfhllpue3-30
  doc/en/release-notes/bzr-1.4.txt bzr1.4.txt-20101008081016-21wd86gpfhllpue3-31
  doc/en/release-notes/bzr-1.5.txt bzr1.5.txt-20101008081016-21wd86gpfhllpue3-32
  doc/en/release-notes/bzr-1.6.txt bzr1.6.txt-20101008081016-21wd86gpfhllpue3-33
  doc/en/release-notes/bzr-1.7.txt bzr1.7.txt-20101008081016-21wd86gpfhllpue3-34
  doc/en/release-notes/bzr-1.8.txt bzr1.8.txt-20101008081016-21wd86gpfhllpue3-35
  doc/en/release-notes/bzr-1.9.txt bzr1.9.txt-20101008081016-21wd86gpfhllpue3-36
  doc/en/release-notes/bzr-2.0.txt bzr2.0.txt-20101008081016-21wd86gpfhllpue3-37
  doc/en/release-notes/bzr-2.1.txt bzr2.1.txt-20101008081016-21wd86gpfhllpue3-38
  doc/en/release-notes/bzr-2.2.txt bzr2.2.txt-20101008081016-21wd86gpfhllpue3-39
  doc/en/release-notes/series-template.txt seriestemplate.txt-20101013054755-s5nh8umufeofyhfz-2
renamed:
  NEWS => doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
  NEWS-template.txt => doc/en/release-notes/release-template.txt newstemplate.txt-20100219053124-f4a3zo3ujiyawh7n-1
modified:
  .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_config.py test_config.py-20100927150753-x6rf54uibd08r636-1
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
  doc/developers/index-plain.txt indexplain.txt-20090909123806-96yfsgrqwra8cwq7-1
  doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
  doc/en/conf.py                 conf.py-20090722133816-63ik5s6s5gsnz7zy-12
  doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
  doc/en/whats-new/whats-new-in-2.3.txt whatsnewin2.3.txt-20100818072501-x2h25r7jbnknvy30-1
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/generate_release_notes.py generate_release_not-20090903045433-6vjlqni6dfgv2ekv-1
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------

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