← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2009-12-07 19:08:41 UTC
  • mto: This revision was merged to the branch mainline in revision 4873.
  • Revision ID: aaron@aaronbentley.com-20091207190841-ne3jm351br9dt2f1
Ensure merge -i doesn't leave branch write_locked.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3819
3819
        shelver = shelf_ui.Shelver(merger.this_tree, result_tree, destroy=True,
3820
3820
                                   reporter=shelf_ui.ApplyReporter(),
3821
3821
                                   diff_writer=writer(sys.stdout))
3822
 
        shelver.run()
 
3822
        try:
 
3823
            shelver.run()
 
3824
        finally:
 
3825
            shelver.finalize()
3823
3826
 
3824
3827
    def sanity_check_merger(self, merger):
3825
3828
        if (merger.show_base and