Rev 4468: Had a slightly bogus test. in http://bazaar.launchpad.net/~jameinel/bzr/1.17-rework-annotate

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.17-rework-annotate

------------------------------------------------------------
revno: 4468
revision-id: john at arbash-meinel.com-20090618200222-hdxftw52lbopaaal
parent: john at arbash-meinel.com-20090618192539-z18ym3jxutv1fpwx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.17-rework-annotate
timestamp: Thu 2009-06-18 15:02:22 -0500
message:
  Had a slightly bogus test.
-------------- next part --------------
=== modified file 'bzrlib/tests/test__annotator.py'
--- a/bzrlib/tests/test__annotator.py	2009-06-18 19:00:50 +0000
+++ b/bzrlib/tests/test__annotator.py	2009-06-18 20:02:22 +0000
@@ -225,7 +225,7 @@
     def test_annotate_many_way_common_merge_text(self):
         self.make_many_way_common_merge_text()
         ann = self.module.Annotator(self.vf)
-        self.assertAnnotateEqual([(self.fa_key, 'simple\n'),
-                                  (self.fb_key, 'new content\n')],
-                                 ann, self.ff_key)
+        self.assertEqual([(self.fa_key, 'simple\n'),
+                         (self.fb_key, 'new content\n')],
+                         ann.annotate_flat(self.ff_key))