← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Robey Pointer
  • Date: 2006-09-03 00:28:18 UTC
  • mfrom: (1981 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060903002818-71ca5c7bfea93a26
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

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