← 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: Patch Queue Manager
  • Date: 2012-03-06 19:49:19 UTC
  • mfrom: (6472.2.6 use-bzr-controldir)
  • Revision ID: pqm@pqm.ubuntu.com-20120306194919-kt7mj6xmhifsgees
(jelmer) Use bzrlib.controldir for generic access to control directories,
 rather than bzrlib.bzrdir. (Jelmer Vernooij)

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,
48
49
        def wt(name):
49
50
           path = pathjoin(self.dir, name)
50
51
           os.mkdir(path)
51
 
           wt = bzrlib.bzrdir.BzrDir.create_standalone_workingtree(path)
 
52
           wt = controldir.ControlDir.create_standalone_workingtree(path)
52
53
           # the tests perform pulls, so need a branch that is writeable.
53
54
           wt.lock_write()
54
55
           wt.set_root_id(self.tree_root)