Rev 4618: Since the merge depth changed, it causes log to change slightly as well. in http://bazaar.launchpad.net/~jameinel/bzr/2.0b1-merge-sort

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.0b1-merge-sort

------------------------------------------------------------
revno: 4618
revision-id: john at arbash-meinel.com-20090817193129-0512zwglhybx6eiq
parent: john at arbash-meinel.com-20090817192506-zz88yvzsy42gh2t7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0b1-merge-sort
timestamp: Mon 2009-08-17 14:31:29 -0500
message:
  Since the merge depth changed, it causes log to change slightly as well.
  Now the intermediate node is considered to be merging the file change, and thus it
  also gets included in the per-file output.
-------------- next part --------------
=== modified file 'bzrlib/tests/test_log.py'
--- a/bzrlib/tests/test_log.py	2009-08-17 19:25:06 +0000
+++ b/bzrlib/tests/test_log.py	2009-08-17 19:31:29 +0000
@@ -1310,7 +1310,7 @@
         revisions = list(log.get_view_revisions(
                 mainline_revs, rev_nos, b, 'forward'))
         expected = [('1', '1', 0), ('2', '2', 0), ('3c', '3', 0),
-                    ('3a', '2.1.1', 1), ('3b', '2.2.1', 1), ('4b', '4', 0),
+                    ('3b', '2.2.1', 1), ('3a', '2.1.1', 2), ('4b', '4', 0),
                     ('4a', '2.2.2', 1)]
         self.assertEqual(expected, revisions)
         revisions = list(log.get_view_revisions(
@@ -1343,10 +1343,10 @@
 
         rev_3a = rev_from_rev_id('3a', b)
         rev_4b = rev_from_rev_id('4b', b)
-        self.assertEqual([('3c', '3', 0), ('3a', '2.1.1', 1)],
+        self.assertEqual([('3c', '3', 0), ('3b', '2.2.1', 1), ('3a', '2.1.1', 2)],
                           view_revs(rev_3a, rev_4b, 'f-id', 'reverse'))
         # Note: 3c still appears before 3a here because of depth-based sorting
-        self.assertEqual([('3c', '3', 0), ('3a', '2.1.1', 1)],
+        self.assertEqual([('3c', '3', 0), ('3b', '2.2.1', 1), ('3a', '2.1.1', 2)],
                           view_revs(rev_3a, rev_4b, 'f-id', 'forward'))