← 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: Aaron Bentley
  • Date: 2006-06-23 17:22:59 UTC
  • mto: This revision was merged to the branch mainline in revision 1810.
  • Revision ID: abentley@panoramicfeedback.com-20060623172259-e34bbebf91d9d0f8
Sort revisions at each depth, instead of just mainline revisions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_log.py
400
400
        mainline_revs, rev_nos, wt = self.make_tree_with_many_merges()
401
401
        revisions = list(get_view_revisions(mainline_revs, rev_nos, wt.branch,
402
402
                                            'forward'))
403
 
        expected = [('1', 1, 0), ('2', 2, 0), ('3c', 3, 0), ('3b', None, 1),
404
 
                    ('3a', None, 1), ('4b', 4, 0), ('4a', None, 1)]
 
403
        expected = [('1', 1, 0), ('2', 2, 0), ('3c', 3, 0), ('3a', None, 1),
 
404
                    ('3b', None, 1), ('4b', 4, 0), ('4a', None, 1)]
405
405
        self.assertEqual(revisions, expected)
406
406
        revisions = list(get_view_revisions(mainline_revs, rev_nos, wt.branch,
407
407
                                             'forward', include_merges=False))