Rev 1950: Made assertDeprecated return the callable's result in /home/pqm/archives/thelove/bzr/+trunk/

Tue Aug 22 18:02:23 BST 2006

------------------------------------------------------------
revno: 1950
revision-id: pqm at pqm.ubuntu.com-20060822170222-c5f47d2de719bc8d
parent: pqm at pqm.ubuntu.com-20060822164041-3ff8e0735c0cb7c0
parent: abentley at panoramicfeedback.com-20060817133202-7dc09f67fcb9f0b2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2006-08-22 18:02:22 +0100
message:
  Made assertDeprecated return the callable's result
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060817133202-7dc09f67fcb9f0b2
    parent: abentley at panoramicfeedback.com-20060817132740-3bee777fda93b125
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-08-17 09:32:02 -0400
    message:
      Made assertDeprecated return the callable's result
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060817132740-3bee777fda93b125
    parent: abentley at panoramicfeedback.com-20060814154505-f7182110bfcce1bc
    parent: pqm at pqm.ubuntu.com-20060817075209-e85a1f9e05ff8b87
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2006-08-17 09:27:40 -0400
    message:
      Merge bzr.dev