Merge lp:~spiv/bzr/reconcile-cleanup-503878 into lp:bzr
Proposed by
Andrew Bennetts
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | John A Meinel | ||||
Approved revision: | not available | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~spiv/bzr/reconcile-cleanup-503878 | ||||
Merge into: | lp:bzr | ||||
Diff against target: |
120 lines (+37/-34) 2 files modified
NEWS (+3/-0) bzrlib/reconcile.py (+34/-34) |
||||
To merge this branch: | bzr merge lp:~spiv/bzr/reconcile-cleanup-503878 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Approve | ||
Review via email: mp+16944@code.launchpad.net |
To post a comment you must log in.
This replaces some try/finally blocks in reconcile.py with more robust add_cleanup calls using OperationWithCl eanups. This fixes bug 503878 and probably a few unreported ones like it.
(This borrows the definition of OperationWithCl eanups. run_simple from <https:/ /code.edge. launchpad. net/~spiv/ bzr/command- cleanup/ +merge/ 16943>)