Annotation view breaks if calculated blame is incorrect

The annotation view for a file uses the blame as the starting point for rendering. The logic is as follows:

for each blame chunk:

• write the annotation
• for line=chunk.start to chunk.end
  • write the line of the source

If for some reason the blame is incorrect (e.g. CRUC-5215) and has too few or too many lines, the resulting annotation is incorrect (truncated or extraneous blame annotations).

One example of the annotation view getting it wrong. Compare the annotated view with the raw view:

http://clearcase.sydney.atlassian.com:6060/foo/browse/base-sanity/vob/sanity/interbranch_merging/test.txt?r=\main\branch_rel2\1

Annotation view:

Raw view: