← 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-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_fetch.py
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('dirstate-with-subtree')
 
70
        f = bzrdir.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)
101
101
                              % b_bzrdir.transport)
102
102
        tree_b.commit('no change', rev_id='rev2')
103
103
        rev2_tree = knit3_repo.revision_tree('rev2')
104
 
        self.assertEqual('rev1', rev2_tree.inventory.root.revision)
 
104
        self.assertEqual(
 
105
            'rev1',
 
106
            rev2_tree.get_file_revision(rev2_tree.get_root_id()))
105
107
 
106
108
    def do_test_fetch_to_rich_root_sets_parents_correctly(self, result,
107
109
        snapshots, root_id=ROOT_ID, allow_lefthand_ghost=False):