← 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: Jelmer Vernooij
  • Date: 2012-04-02 01:44:26 UTC
  • mfrom: (6518 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6519.
  • Revision ID: jelmer@samba.org-20120402014426-0o5qtysohyl006b2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
19
19
 
20
20
import bzrlib
21
21
from bzrlib import (
 
22
    controldir,
22
23
    errors,
23
24
    generate_ids,
24
25
    merge_directive,
42
43
 
43
44
 
44
45
class MergeBuilder(object):
 
46
 
45
47
    def __init__(self, dir=None):
46
48
        self.dir = osutils.mkdtemp(prefix="merge-test", dir=dir)
47
49
        self.tree_root = generate_ids.gen_root_id()
48
50
        def wt(name):
49
51
           path = pathjoin(self.dir, name)
50
52
           os.mkdir(path)
51
 
           wt = bzrlib.bzrdir.BzrDir.create_standalone_workingtree(path)
 
53
           wt = controldir.ControlDir.create_standalone_workingtree(path)
52
54
           # the tests perform pulls, so need a branch that is writeable.
53
55
           wt.lock_write()
54
56
           wt.set_root_id(self.tree_root)