Rev 1430: merge from mbp. in /home/robertc/source/baz/integration

[Robert Collins]

------------------------------------------------------------
revno: 1430
revision-id: robertc at robertcollins.net-20051214075934-6e951a9908674e50
parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2005-12-14 18:59:34 +1100
message:
  merge from mbp.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
    parent: mbp at sourcefrog.net-20051213054640-05a8971e11b1ba66
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2005-12-13 16:48:04 +1100
    message:
      MsgEditor tests should be skipped on platforms without unicode fs.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051213054640-05a8971e11b1ba66
    parent: mbp at sourcefrog.net-20051213054051-a82f95d7d417f73b
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2005-12-13 16:46:40 +1100
    message:
      Fix up display of reasons why tests were skipped.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051213054051-a82f95d7d417f73b
    parent: mbp at sourcefrog.net-20051213051217-5efd4ec3b060bfaf
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2005-12-13 16:40:51 +1100
    message:
      New TestSkipped facility, and tests for it.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051213051217-5efd4ec3b060bfaf
    parent: mbp at sourcefrog.net-20051213035433-26282b8f72702fc3
    parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2005-12-13 16:12:17 +1100
    message:
      [merge] robertc, source-examination test
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051213035433-26282b8f72702fc3
    parent: mbp at sourcefrog.net-20051212072002-d3a0d6a76a3017c0
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Tue 2005-12-13 14:54:33 +1100
    message:
      [patch] Speed improvement for Weave.join() (Goffredo Baroncelli)