Rev 1455: [merge] robertc in /home/mbp/work/bzr.dev

[Martin Pool]

------------------------------------------------------------
revno: 1455
revision-id: mbp at sourcefrog.net-20051129224508-a00d4c713de2d29c
parent: mbp at sourcefrog.net-20051129100414-54250ca617c5252c
parent: robertc at robertcollins.net-20051128083347-e792ce37b3ecd5a0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: bzr.dev
timestamp: Wed 2005-11-30 09:45:08 +1100
message:
  [merge] robertc
added:
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
renamed:
  bzrlib/tests/blackbox/__init__.py => bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/blackbox/versioning.py => bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051128083347-e792ce37b3ecd5a0
    parent: robertc at robertcollins.net-20051128053717-b1a3a7dbe854eeae
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2005-11-28 19:33:47 +1100
    message:
      Unbreak self.build_tree_shape in tests.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051128053717-b1a3a7dbe854eeae
    parent: robertc at robertcollins.net-20051128051341-059936f2f29a12c8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2005-11-28 16:37:17 +1100
    message:
      Blackbox tests are maintained within the bzrlib.tests.blackbox directory.
      If adding a new test script please add that to bzrlib.tests.blackbox.__init__.
      (Robert Collins)
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051128051341-059936f2f29a12c8
    parent: robertc at robertcollins.net-20051127225107-51ad77cb1f322e3d
    parent: mbp at sourcefrog.net-20051125062856-e4c887417108fd9e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2005-11-28 16:13:41 +1100
    message:
      Merge from Martin. Adjust check to work with HTTP again.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051127225107-51ad77cb1f322e3d
    parent: robertc at robertcollins.net-20051127223834-d00ecca0d0b9384a
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2005-11-28 09:51:07 +1100
    message:
      Make the commenting out of a test in testconfig explicit.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051127223834-d00ecca0d0b9384a
    parent: robertc at robertcollins.net-20051122212830-885c284847f0b17b
    parent: mbp at sourcefrog.net-20051122043014-6df209fd93033b59
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Mon 2005-11-28 09:38:34 +1100
    message:
      Merge from mpool, adjusting check to retain HTTP support.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051122212830-885c284847f0b17b
    parent: robertc at robertcollins.net-20051113201422-8a34ef413bfc8222
    parent: mbp at sourcefrog.net-20051118081007-80523bf145eb319b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Wed 2005-11-23 08:28:30 +1100
    message:
      Merge from mpool.