# 
# patch "ChangeLog"
#  from [a3dd7b4f44831c43d399b57eca1d9a2558d56be8]
#    to [00763fab95bee19df2f8af3c0df1485ebbb517d2]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,16 @@
+2005-05-20  Emile Snyder  <address@hidden>
+
+	* annotate.{hh,cc}: Rework to handle lineage dependent line
+	mappings and lines which split from a single line in a parent
+	revision into multiple lines in some descendent.  Fixes bug where
+	some lines remained unannotated.  Fixes wrong assignment of lines
+	bug.
+	* tests/t_annotate.at: Check no-changes since addition of file
+	case.
+	* tests/t_annotate_lineage_dependent.at
+	* tests/t_annotate_split_lines.at:  New tests.
+	* testsuite.at: Add them.
+	
 2005-05-21  Matt Johnston  <address@hidden>
 
 	* packet.cc (db_packet_writer::~impl, prerequisite.cleanup):