← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-12-07 22:32:56 UTC
  • mfrom: (4832.2.2 merge-i-lock)
  • Revision ID: pqm@pqm.ubuntu.com-20091207223256-9e6l1vc6h3jc2eqs
(abentley) merge -i doesn't leave branches write-locked.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3836
3836
        shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3837
3837
                                   reporter=shelf_ui.ApplyReporter(),
3838
3838
                                   diff_writer=writer(sys.stdout))
3839
 
        shelver.run()
 
3839
        try:
 
3840
            shelver.run()
 
3841
        finally:
 
3842
            shelver.finalize()
3840
3843
 
3841
3844
    def sanity_check_merger(self, merger):
3842
3845
        if (merger.show_base and