← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository_vf/test_write_group.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/per_repository_vf/test_write_group.py
20
20
 
21
21
from bzrlib import (
22
22
    branch,
23
 
    bzrdir,
 
23
    controldir,
24
24
    errors,
25
25
    memorytree,
26
26
    remote,
87
87
            # repository, but the default format is unstackble.  So explicitly
88
88
            # make a stackable real repository and use that.
89
89
            repo = self.make_repository(relpath, format='1.9')
90
 
            repo = bzrdir.BzrDir.open(self.get_url(relpath)).open_repository()
 
90
            dir = controldir.ControlDir.open(self.get_url(relpath))
 
91
            repo = dir.open_repository()
91
92
        else:
92
93
            repo = self.make_repository(relpath)
93
94
        if not repo._format.supports_external_lookups: