← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_tsort.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-09 13:58:59 UTC
  • mfrom: (3533.2.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080709135859-wq3r1d1fjcafelgw
(jam) (bug #243536) tsort.merge_sorted() can ignore ghosts in the
        mainline history passed in.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_tsort.py
533
533
            mainline_revisions=[None, 'A']
534
534
            )
535
535
 
 
536
    def test_mainline_revs_with_ghost(self):
 
537
        # We have a mainline, but the end of it is actually a ghost
 
538
        # The graph that is passed to tsort has had ghosts filtered out, but
 
539
        # the mainline history has not.
 
540
        self.assertSortAndIterate(
 
541
            {'B':[],
 
542
             'C':['B']}.items(),
 
543
            'C',
 
544
            [(0, 'C', 0, (2,), False),
 
545
             (1, 'B', 0, (1,), True),
 
546
             ],
 
547
             True, mainline_revisions=['A', 'B', 'C'])
 
548
 
536
549
    def test_parallel_root_sequence_numbers_increase_with_merges(self):
537
550
        """When there are parallel roots, check their revnos."""
538
551
        self.assertSortAndIterate(