← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge_core.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-05-05 08:15:28 UTC
  • mfrom: (1692.7.8 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060505081528-8c0368b718fd7933
(mbp,alexander) rmtree forces deletion of readonly files on win32

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
1
1
import os
2
 
import shutil
3
2
import stat
4
3
import sys
5
4
 
12
11
from bzrlib.inventory import RootEntry
13
12
import bzrlib.inventory as inventory
14
13
from bzrlib.merge import Merge3Merger, Diff3Merger, WeaveMerger
15
 
from bzrlib.osutils import file_kind, rename, sha_file, pathjoin, mkdtemp
 
14
from bzrlib.osutils import (file_kind, mkdtemp, pathjoin, rename, rmtree,
 
15
                            sha_file, 
 
16
                            )
16
17
from bzrlib.transform import TreeTransform
17
18
from bzrlib.tests import TestCaseWithTransport, TestCase, TestSkipped
18
19
from bzrlib.workingtree import WorkingTree
176
177
                                                     self.this.inventory_dict)
177
178
 
178
179
    def cleanup(self):
179
 
        shutil.rmtree(self.dir)
 
180
        rmtree(self.dir)
180
181
 
181
182
 
182
183
class MergeTest(TestCase):