← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_log.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-28 07:10:36 UTC
  • mto: This revision was merged to the branch mainline in revision 5190.
  • Revision ID: v.ladeuil+lp@free.fr-20100428071036-rxmh2nfnh7h504d6
https://launchpad.net/bugs/320119
Fixed as per Andrew's review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
1546
1546
class TestLogExcludeAncestry(tests.TestCaseWithTransport):
1547
1547
 
1548
1548
    def make_branch_with_alternate_ancestries(self, relpath='.'):
 
1549
        # See test_merge_sorted_exclude_ancestry below for the difference with
 
1550
        # bt.per_branch.test_iter_merge_sorted_revision.
 
1551
        # TestIterMergeSortedRevisionsBushyGraph. 
 
1552
        # make_branch_with_alternate_ancestries
 
1553
        # and test_merge_sorted_exclude_ancestry
 
1554
        # See the FIXME in assertLogRevnos too.
1549
1555
        builder = branchbuilder.BranchBuilder(self.get_transport(relpath))
1550
1556
        # 1
1551
1557
        # |\
1588
1594
        b = self.make_branch_with_alternate_ancestries()
1589
1595
        self.assertLogRevnos(['3', '1.1.2', '1.2.1', '1.1.1', '2', '1'],
1590
1596
                             b, '1', '3', False)
 
1597
        # '2' is part of the '3' ancestry but not part of '1.1.1' ancestry so
 
1598
        # it should be mentioned even if merge_sort order will make it appear
 
1599
        # after 1.1.1
1591
1600
        self.assertLogRevnos(['3', '1.1.2', '1.2.1', '2'],
1592
1601
                             b, '1.1.1', '3', True)
1593
1602