← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_fetch.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/tests/per_repository/test_fetch.py
17
17
"""Tests for fetch between repositories of the same type."""
18
18
 
19
19
from bzrlib import (
20
 
    bzrdir,
 
20
    controldir,
21
21
    errors,
22
22
    gpg,
23
23
    remote,
67
67
        tree_a.add('foo', 'file1')
68
68
        tree_a.commit('rev1', rev_id='rev1')
69
69
        # create a knit-3 based format to fetch into
70
 
        f = bzrdir.format_registry.make_bzrdir('development-subtree')
 
70
        f = controldir.format_registry.make_bzrdir('development-subtree')
71
71
        try:
72
72
            format = tree_a.branch.repository._format
73
73
            format.check_conversion_target(f.repository_format)