Rev 2913: It seems that plain=True was not implemented for all paths. in http://bzr.arbash-meinel.com/branches/bzr/0.92-dev/knit_parents

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.92-dev/knit_parents

------------------------------------------------------------
revno: 2913
revision-id:john at arbash-meinel.com-20071026220603-ks85ogcjuw13cw1k
parent: john at arbash-meinel.com-20071026215719-zzjyosi3xbgpdh84
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_parents
timestamp: Fri 2007-10-26 17:06:03 -0500
message:
  It seems that plain=True was not implemented for all paths.
modified:
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
-------------- next part --------------
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py	2007-10-26 21:57:19 +0000
+++ b/bzrlib/knit.py	2007-10-26 22:06:03 +0000
@@ -2484,8 +2484,12 @@
             lines = self.target.factory.lower_fulltext(content)
             delta_parent = None
         else:
-            delta = self.source.factory.parse_line_delta(data, version_id,
-                plain=True)
+            if (self.source.factory.annotated and not
+                self.target.factory.annotated):
+                delta = self.source.factory.parse_line_delta(data, version_id,
+                    plain=True)
+            else:
+                delta = self.source.factory.parse_line_delta(data, version_id)
             lines = self.target.factory.lower_line_delta(delta)
             delta_parent = parents[0]
         has_eol = 'no-eol' in options