Rev 1824: (jam) add run_bzr_error, clean up remerge tests in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1824
revision-id: pqm at pqm.ubuntu.com-20060629182157-cdc39b5f9e4fac85
parent: pqm at pqm.ubuntu.com-20060629170726-bc2f3986d337be18
parent: john at arbash-meinel.com-20060629165235-5dda727d9baa5237
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2006-06-29 19:21:57 +0100
message:
  (jam) add run_bzr_error, clean up remerge tests
added:
  bzrlib/tests/blackbox/test_remerge.py test_remerge.py-20060629162739-o9m3s6143v8jnr2y-1
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060629165235-5dda727d9baa5237
    parent: john at arbash-meinel.com-20060629165104-f702406d391ea956
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-06-29 11:52:35 -0500
    message:
      Update test_remerge with new api, and minor fixes.
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060629165104-f702406d391ea956
    parent: john at arbash-meinel.com-20060629163047-bcd77c46dc893d4b
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-06-29 11:51:04 -0500
    message:
      Default to retcode=3, and add a test for run_bzr_error
    ------------------------------------------------------------
    merged: john at arbash-meinel.com-20060629163047-bcd77c46dc893d4b
    parent: john at arbash-meinel.com-20060628201853-1707d1bf66b43c41
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Thu 2006-06-29 11:30:47 -0500
    message:
      Add run_bzr_errors alongside run_bzr, to make it easy to check the right error is occurring.