Rev 4630: Conform to the direct merge_sort test. in http://bazaar.launchpad.net/~jameinel/bzr/1.19-known-graph-sorted

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.19-known-graph-sorted

------------------------------------------------------------
revno: 4630
revision-id: john at arbash-meinel.com-20090817153948-9p2d460l6loui7tw
parent: john at arbash-meinel.com-20090817153852-9127xf3aabmcoegt
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.19-known-graph-sorted
timestamp: Mon 2009-08-17 10:39:48 -0500
message:
  Conform to the direct merge_sort test.
-------------- next part --------------
=== modified file 'bzrlib/tests/test__known_graph.py'
--- a/bzrlib/tests/test__known_graph.py	2009-08-13 21:54:04 +0000
+++ b/bzrlib/tests/test__known_graph.py	2009-08-17 15:39:48 +0000
@@ -404,7 +404,7 @@
         self.assertSortAndIterate(graph, 'F',
             [(0, 'F', 0, (3,), False),
              (1, 'D', 1, (2,2,1), False),
-             (2, 'C', 1, (2,1,1), True), # XXX: Shouldn't it be merge_depth=2?
+             (2, 'C', 2, (2,1,1), True),
              (3, 'B', 0, (2,), False),
              (4, 'A', 0, (1,), True),
              ])