← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
578
578
        self.repo.fetch(self.tree.branch.repository, 'second-id')
579
579
        root_id = self.tree.get_root_id()
580
580
        self.assertEqual(
581
 
            ((root_id, 'left-parent'), (root_id, 'ghost-parent'),
582
 
             (root_id, 'not-ghost-parent')),
 
581
            ((root_id, 'left-parent'), (root_id, 'not-ghost-parent')),
583
582
            self.get_parents(root_id, 'second-id'))
584
583
 
585
584
    def make_two_commits(self, change_root, fetch_twice):