/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.

Show diffs side-by-side

added added

removed removed

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