[Monotone-commits-diffs] Revision 608ab9783c40144b79f2280f030fe6104731bd74

[monotone]

-----------------------------------------------------------------
Revision: 608ab9783c40144b79f2280f030fe6104731bd74
Ancestor: 556bd9e3c8ecc8d86a0dfcfb2bd391ab1fd11e55
Author: address@hidden
Date: 2005-05-14T06:39:48
Branch: net.venge.monotone.annotate

Added files:
        tests/t_annotate_split_line.at
Modified files:
        annotate.cc testsuite.at

ChangeLog: 

2005-05-13  Emile Snyder  <address@hidden>

        More annotate work.  Fixed two major sources of error: inability
        to handle lineage dependent and divergent line mapping, and the
        inability to handle lines which "split" from a single line in a
        parent revision to several (identical content lines) in some
        descendent revision.

        * annotate.cc:  New class lineage_merge_node to help with the path
        dependent lineage stuff.  New code to use it, and merge lineages.
        * tests/t_annotate_split_lines.at:  New test to exercise the line
        splitting case.
        * testsuite.at:  Add it.

txtXLxpmss6Mc.txt
Description: Diff [556bd9e3c8ecc8d86a0dfcfb2bd391ab1fd11e55] -> [608ab9783c40144b79f2280f030fe6104731bd74]