← 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: Robert Collins
  • Date: 2008-04-04 00:06:58 UTC
  • mto: This revision was merged to the branch mainline in revision 3350.
  • Revision ID: robertc@robertcollins.net-20080404000658-uw2nmrw8t5kcqbly
Remove manual notification of transaction finishing on versioned files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge.py
455
455
 
456
456
    def setUp(self):
457
457
        TestCaseWithMemoryTransport.setUp(self)
458
 
        self.vf = knit.KnitVersionedFile('root', self.get_transport(),
459
 
                                         create=True)
 
458
        self.vf = knit.make_file_knit('root', self.get_transport(),
 
459
            create=True)
460
460
        self.plan_merge_vf = versionedfile._PlanMergeVersionedFile('root',
461
461
                                                                   [self.vf])
462
462