bzrlib.merge do_merge has fragile cleanups

[James Westby]

Hi,

            self.tt = TreeTransform(self.this_tree, self.pb)
            try:
                self.pp.next_phase()
                self._compute_transform()
                self.pp.next_phase()
                results = self.tt.apply(no_conflicts=True)
                self.write_modified(results)
                try:
                    self.this_tree.add_conflicts(self.cooked_conflicts)
                except UnsupportedOperation:
                    pass
            finally:
                self.tt.finalize()

finalize can raise exceptions (ImmortalPendingDeletion), which can mask
an existing exception. It would be great to at least know what exception
was being masked, or to use bzrlib.cleanup instead of finally.

Thanks,

James

[Andrew Bennetts (spiv)]

Fair enough. I'll submit a branch to use bzrlib.cleanup in merge.py.

[Andrew Bennetts (spiv)]

Fixed on the 2.1 branch.