Merge lp:~spiv/bzr/traceback-accumulation-2.2 into lp:bzr/2.2
Proposed by
Andrew Bennetts
Status: | Merged |
---|---|
Approved by: | Andrew Bennetts |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5091 |
Proposed branch: | lp:~spiv/bzr/traceback-accumulation-2.2 |
Merge into: | lp:bzr/2.2 |
Diff against target: |
81 lines (+16/-32) 2 files modified
NEWS (+4/-4) bzrlib/tests/__init__.py (+12/-28) |
To merge this branch: | bzr merge lp:~spiv/bzr/traceback-accumulation-2.2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pool | Approve | ||
Review via email: mp+35778@code.launchpad.net |
Commit message
Replace TestCase__copy__ hack with more direct workaround in clone_test.
Description of the change
This is a more conservative workaround than the previous hack (which seems to mysteriously fail when sent to land in lp:bzr, but landed just fine in lp:bzr/2.2).
It removes the __copy__ method in favour of making clone_test explicitly reset just the details dict (given that the other mutable, shared attributes aren't causing us any grief).
To post a comment you must log in.
+1, to my mind this is arguably a cleaner fix anyhow.