Rev 1455: Merge from mainline. in /home/robertc/source/baz/integration/

[Robert Collins]

------------------------------------------------------------
revno: 1455
revision-id: robertc at robertcollins.net-20060131044410-50e7a77576907473
parent: robertc at robertcollins.net-20060129221024-3fb7b838e5cd3e02
parent: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Tue 2006-01-31 15:44:10 +1100
message:
  Merge from mainline.
modified:
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060130115534-d9ca79b5856a08fa
    parent: mbp at sourcefrog.net-20060130062350-d6f25277ddcdfd79
    parent: john at arbash-meinel.com-20060126183314-bed197fc11d30c17
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-01-30 22:55:34 +1100
    message:
      [merge] jam-pending small fixes
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060126183314-bed197fc11d30c17
    parent: john at arbash-meinel.com-20060126174424-4825872c449513b1
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Thu 2006-01-26 12:33:14 -0600
    message:
      Changing the exception that sftp.py throws when it can't find paramiko, so that the test suite can handle it.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060126174424-4825872c449513b1
    parent: john at arbash-meinel.com-20060126174317-da6f057bb33f0d68
    parent: john at arbash-meinel.com-20060126172803-a1dfbefffaa899a3
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Thu 2006-01-26 11:44:24 -0600
    message:
      [merge] win32: allow selftest to run without paramiko
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060126172803-a1dfbefffaa899a3
    parent: john at arbash-meinel.com-20060126151809-9fd33fa77d4a31c5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-win32
    timestamp: Thu 2006-01-26 11:28:03 -0600
    message:
      Allow selftest to run, even if we can't load a transport.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060126174317-da6f057bb33f0d68
    parent: john at arbash-meinel.com-20060126173857-0b2890d871c14b10
    parent: john at arbash-meinel.com-20060126151809-9fd33fa77d4a31c5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Thu 2006-01-26 11:43:17 -0600
    message:
      [merge] jam-integration 1512
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060126173857-0b2890d871c14b10
    parent: john at arbash-meinel.com-20060126140355-a51a4b80247405f5
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Thu 2006-01-26 11:38:57 -0600
    message:
      Allow bzr selftest --one to continue, even if we have a Skipped test.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060126140355-a51a4b80247405f5
    parent: john at arbash-meinel.com-20060125184821-ed0f851ed35317eb
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Thu 2006-01-26 08:03:55 -0600
    message:
      Giving nicer warning when there is a leftover xml.pyc file.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060125184821-ed0f851ed35317eb
    parent: john at arbash-meinel.com-20060123223323-16eb865383bf650a
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Wed 2006-01-25 12:48:21 -0600
    message:
      Fix error when we can't find an editor
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060123223323-16eb865383bf650a
    parent: john at arbash-meinel.com-20060123223055-43e99c932f0c8945
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Mon 2006-01-23 16:33:23 -0600
    message:
      From Jari Alto: Makefile fixes (clean target error suppression)
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060123223055-43e99c932f0c8945
    parent: john at arbash-meinel.com-20060116220752-f88bd067eb868bfb
    parent: john at arbash-meinel.com-20060120193409-1466a4908863d28f
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr-jam-pending
    timestamp: Mon 2006-01-23 16:30:55 -0600
    message:
      [merge] jam-integration
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060130062350-d6f25277ddcdfd79
    parent: mbp at sourcefrog.net-20060123020939-567fb193328ed7a6
    parent: robertc at robertcollins.net-20060129221024-3fb7b838e5cd3e02
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.dev (Main development branch)
    timestamp: Mon 2006-01-30 17:23:50 +1100
    message:
      [merge] robert's integration of much recent work