Rev 4489: Figure out why we don't want to copy_base_content=False. in http://bazaar.launchpad.net/~jameinel/bzr/1.17-rework-annotate
John Arbash Meinel
john at arbash-meinel.com
Tue Jun 23 20:09:29 BST 2009
At http://bazaar.launchpad.net/~jameinel/bzr/1.17-rework-annotate
------------------------------------------------------------
revno: 4489
revision-id: john at arbash-meinel.com-20090623190924-5jzikwlde7sc0z29
parent: john at arbash-meinel.com-20090623185734-bum18jak2qv7mfsg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.17-rework-annotate
timestamp: Tue 2009-06-23 14:09:24 -0500
message:
Figure out why we don't want to copy_base_content=False.
-------------- next part --------------
=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py 2009-06-23 18:57:34 +0000
+++ b/bzrlib/knit.py 2009-06-23 19:09:24 +0000
@@ -3413,11 +3413,13 @@
if num == 0:
base_content = self._content_objects.pop(compression_parent)
self._num_compression_children.pop(compression_parent)
- copy_base_content = False
else:
self._num_compression_children[compression_parent] = num
base_content = self._content_objects[compression_parent]
- copy_base_content = True
+ # It is tempting to want to copy_base_content=False for the last
+ # child object. However, whenever noeol=False,
+ # self._text_cache[parent_key] is content._lines. So mutating it
+ # gives very bad results.
content, _ = self._vf._factory.parse_record(
key, record, record_details, base_content,
copy_base_content=True)
More information about the bazaar-commits
mailing list