Rev 1434: Merge from mbp. in /home/robertc/source/baz/integration

[Robert Collins]

------------------------------------------------------------
revno: 1434
revision-id: robertc at robertcollins.net-20060102211101-672549a6c738eb0e
parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
parent: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-03 08:11:01 +1100
message:
  Merge from mbp.
modified:
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051216014735-906c2145b95924eb
    parent: mbp at sourcefrog.net-20051216003931-476d497e6dbd21b9
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2005-12-16 12:47:35 +1100
    message:
      Remove config.guess and configure.in from builtin ignore list.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051216003931-476d497e6dbd21b9
    parent: mbp at sourcefrog.net-20051216002517-73448ea063865983
    parent: robertc at robertcollins.net-20051215083203-07b824bae89674c1
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2005-12-16 11:39:31 +1100
    message:
      [merge] robert
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051216002517-73448ea063865983
    parent: mbp at sourcefrog.net-20051216001728-5c9086013d1bbf8f
    parent: robertc at robertcollins.net-20051214090140-b70938f467aaea6f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2005-12-16 11:25:17 +1100
    message:
      [merge] robertc: file encoding tests, and run all tests in C locale as well as default
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051214090140-b70938f467aaea6f
    parent: robertc at robertcollins.net-20051214075326-3c1f619fa0f73514
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: run_tests_twice_for_i18n
    timestamp: Wed 2005-12-14 20:01:40 +1100
    message:
      forgot my self.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051214075326-3c1f619fa0f73514
    parent: robertc at robertcollins.net-20051212233303-1084576233b6e3b1
    parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: run_tests_twice_for_i18n
    timestamp: Wed 2005-12-14 18:53:26 +1100
    message:
      Merge from upstream.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051212233303-1084576233b6e3b1
    parent: robertc at robertcollins.net-20051212231443-a2228c4350ea0a14
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: run_tests_twice_for_i18n
    timestamp: Tue 2005-12-13 10:33:03 +1100
    message:
      Fix typo in my msgeditor test changes.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20051212231443-a2228c4350ea0a14
    parent: robertc at robertcollins.net-20051212223421-c0f6e7a7fae0b5ee
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: run_tests_twice_for_i18n
    timestamp: Tue 2005-12-13 10:14:43 +1100
    message:
      Run the test suite with no locale as well as the default locale. Also add a test for build_tree_shape to selftest.
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20051216001728-5c9086013d1bbf8f
    parent: mbp at sourcefrog.net-20051213054804-e1dcb0c21cacd174
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Fri 2005-12-16 11:17:28 +1100
    message:
      Add notes on merge/review process.