Rev 5583: Merge 321320-isolate-doc-tests into final-cleanup in file:///home/vila/src/bzr/bugs/test-isolation/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/test-isolation/

------------------------------------------------------------
revno: 5583 [merge]
revision-id: v.ladeuil+lp at free.fr-20110107111350-d51n68u6nrpcnmkq
parent: v.ladeuil+lp at free.fr-20101221093332-g1t5wi6ssb2squcx
parent: v.ladeuil+lp at free.fr-20110107111347-3ovv39zf4nf3ep0d
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: final-cleanup
timestamp: Fri 2011-01-07 12:13:50 +0100
message:
  Merge 321320-isolate-doc-tests into final-cleanup
modified:
  .testr.conf                    testr.conf-20100228092111-z02a13qrv22mn7up-1
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_timestamp.py test_timestamp.py-20070306153932-r3ejn242c20asagv-1
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
  bzrlib/timestamp.py            timestamp.py-20070306142322-ttbb9oulf3jotljd-1
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
  bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
  doc/developers/releasing.txt   releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
  doc/developers/testing.txt     testing.txt-20080812140359-i70zzh6v2z7grqex-1
  doc/en/release-notes/bzr-2.2.txt bzr2.2.txt-20101008081016-21wd86gpfhllpue3-39
  doc/en/release-notes/bzr-2.3.txt NEWS-20050323055033-4e00b5db738777ff
  doc/en/upgrade-guide/data_migration.txt data_migration.txt-20090702082510-q2pocf7uhntljqnl-2
  doc/en/upgrade-guide/index.txt index.txt-20090702082510-q2pocf7uhntljqnl-3
  doc/en/upgrade-guide/overview.txt overview.txt-20090702082510-q2pocf7uhntljqnl-4
  doc/en/whats-new/whats-new-in-2.3.txt whatsnewin2.3.txt-20100818072501-x2h25r7jbnknvy30-1
-------------- next part --------------

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