~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_merge.py

(gz) Create working tree at specified revision when doing a local push
 (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
559
559
class TestPlanMerge(TestCaseWithMemoryTransport):
560
560
 
561
561
    def setUp(self):
562
 
        super(TestPlanMerge, self).setUp()
 
562
        TestCaseWithMemoryTransport.setUp(self)
563
563
        mapper = versionedfile.PrefixMapper()
564
564
        factory = knit.make_file_factory(True, mapper)
565
565
        self.vf = factory(self.get_transport())