← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.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/tests/test_merge.py
385
385
        merger.merge_type = _mod_merge.Merge3Merger
386
386
        tree_merger = merger.make_merger()
387
387
        tt = tree_merger.make_preview_transform()
 
388
        self.addCleanup(tt.finalize)
388
389
        preview_tree = tt.get_preview_tree()
389
390
        tree_file = this_tree.get_file('file-id')
390
391
        try: