← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2012-07-06 17:06:02 UTC
  • mto: This revision was merged to the branch mainline in revision 6535.
  • Revision ID: jelmer@samba.org-20120706170602-1r5m1una9oucwvah
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/bzrdir.py
545
545
    def convert(self, to_convert, pb):
546
546
        """See Converter.convert()."""
547
547
        from bzrlib.plugins.weave_fmt.repository import RepositoryFormat7
548
 
        from bzrlib.branch import BzrBranchFormat5
 
548
        from bzrlib.branchfmt.fullhistory import BzrBranchFormat5
549
549
        self.bzrdir = to_convert
550
550
        self.pb = ui.ui_factory.nested_progress_bar()
551
551
        self.count = 0