~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: 2009-08-17 21:06:55 UTC
  • mfrom: (4615.1.3 2.0b1-merge-sort)
  • Revision ID: pqm@pqm.ubuntu.com-20090817210655-w8d1xxic3wi6gs61
(jam) Tweak how merge_sort handles right parents when the left parent
        is already processed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
211
211
        self.assertSortAndIterate(graph, 'F',
212
212
            [(0, 'F', 0, (3,), False),
213
213
             (1, 'D', 1, (2,2,1), False),
214
 
             (2, 'C', 1, (2,1,1), True), # XXX: Shouldn't it be merge_depth=2?
 
214
             (2, 'C', 2, (2,1,1), True),
215
215
             (3, 'B', 0, (2,), False),
216
216
             (4, 'A', 0, (1,), True),
217
217
             ], True)