← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
38
38
    cache_utf8,
39
39
    config,
40
40
    conflicts as _mod_conflicts,
 
41
    controldir,
41
42
    debug,
42
43
    dirstate,
43
44
    errors,
1608
1609
    def _get_matchingbzrdir(self):
1609
1610
        """Overrideable method to get a bzrdir for testing."""
1610
1611
        # please test against something that will let us do tree references
1611
 
        return bzrdir.format_registry.make_bzrdir(
 
1612
        return controldir.format_registry.make_bzrdir(
1612
1613
            'development-subtree')
1613
1614
 
1614
1615
    _matchingbzrdir = property(__get_matchingbzrdir)