← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

Update to replaced parent checking api bzrlib/merge.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
431
431
        sure everything matches the builtin branch.
432
432
        """
433
433
        to_tree = self.get_checkout(base_rev_id, checkout_dir=checkout_dir)
 
434
        original_parents = to_tree.get_parent_ids()
434
435
        repository = to_tree.branch.repository
435
436
        self.assertIs(repository.has_revision(base_rev_id), True)
436
437
        for rev in info.real_revisions:
446
447
 
447
448
        self.assert_(to_tree.branch.repository.has_revision(info.target))
448
449
        # Do we also want to verify that all the texts have been added?
449
 
 
450
 
        self.assert_(info.target in to_tree.pending_merges())
451
 
 
 
450
        
 
451
        self.assertEqual(original_parents + [info.target],
 
452
            to_tree.get_parent_ids())
452
453
 
453
454
        rev = info.real_revisions[-1]
454
455
        base_tree = self.b1.repository.revision_tree(rev.revision_id)