← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2008-01-30 08:20:23 UTC
  • mfrom: (3199.1.9 123363-tmp-pollution)
  • mto: This revision was merged to the branch mainline in revision 3207.
  • Revision ID: v.ladeuil+lp@free.fr-20080130082023-15b8pg5idmk7pnun
https://launchpad.net/bugs/123363
Fix 123363 by deleting useless log files and test work dirs in /tmp

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2874
2874
        from bzrlib.diff import show_diff_trees
2875
2875
        tree_merger = merger.make_merger()
2876
2876
        tt = tree_merger.make_preview_transform()
2877
 
        result_tree = tt.get_preview_tree()
2878
 
        show_diff_trees(merger.this_tree, result_tree, self.outf, old_label='',
2879
 
                        new_label='')
 
2877
        try:
 
2878
            result_tree = tt.get_preview_tree()
 
2879
            show_diff_trees(merger.this_tree, result_tree, self.outf,
 
2880
                            old_label='', new_label='')
 
2881
        finally:
 
2882
            tt.finalize()
2880
2883
 
2881
2884
    def _do_merge(self, merger, change_reporter, allow_pending, verified):
2882
2885
        merger.change_reporter = change_reporter