← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

  • Committer: Jelmer Vernooij
  • Date: 2012-06-18 11:43:07 UTC
  • mfrom: (6437.54.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6525.
  • Revision ID: jelmer@samba.org-20120618114307-zeazlym311p38m98
Merge 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_dirstate.py
20
20
import tempfile
21
21
 
22
22
from bzrlib import (
23
 
    bzrdir,
 
23
    controldir,
24
24
    dirstate,
25
25
    errors,
26
26
    inventory,
31
31
    tests,
32
32
    workingtree_4,
33
33
    )
34
 
from bzrlib.transport import memory
35
34
from bzrlib.tests import (
36
35
    features,
37
36
    test_osutils,
2444
2443
    """A minimal api to get InventoryRevisionTree to work."""
2445
2444
 
2446
2445
    def __init__(self):
2447
 
        default_format = bzrdir.format_registry.make_bzrdir('default')
 
2446
        default_format = controldir.format_registry.make_bzrdir('default')
2448
2447
        self._format = default_format.repository_format
2449
2448
 
2450
2449
    def lock_read(self):