← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_remerge.py

  • Committer: Martin Pool
  • Date: 2010-08-13 07:56:06 UTC
  • mfrom: (5050.17.4 2.2)
  • mto: (5050.17.6 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: mbp@sourcefrog.net-20100813075606-8zgmov3ezwans2zo
merge bzr 2.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remerge.py
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib.tests.blackbox import ExternalBase
 
20
from bzrlib.tests import TestCaseWithTransport
21
21
from bzrlib.workingtree import WorkingTree
22
22
 
23
23
 
24
 
class TestRemerge(ExternalBase):
 
24
class TestRemerge(TestCaseWithTransport):
25
25
 
26
26
    def make_file(self, name, contents):
27
27
        f = open(name, 'wb')