# 
# 
# patch "ChangeLog"
#  from [2f112bf7d675476f4defdfbd335bc02c1836ed13]
#    to [8fb041947dfb23956735866fc9f380ac0ea37132]
# 
# patch "roster_merge.cc"
#  from [44672a1e32a6fcc39e9999ece451632d8d62f3a2]
#    to [d1d307d2cc0fac8f4c50963b1563edcc3df26d86]
# 
============================================================
--- ChangeLog	2f112bf7d675476f4defdfbd335bc02c1836ed13
+++ ChangeLog	8fb041947dfb23956735866fc9f380ac0ea37132
@@ -1,3 +1,7 @@
+2006-02-26  Nathaniel Smith  <address@hidden>
+
+	* roster_merge.cc: Update notes on tests.
+
 2006-02-25  Nathaniel Smith  <address@hidden>
 
 	* work.cc (attach_node): Apparently the tests depend on update
============================================================
--- roster_merge.cc	44672a1e32a6fcc39e9999ece451632d8d62f3a2
+++ roster_merge.cc	d1d307d2cc0fac8f4c50963b1563edcc3df26d86
@@ -601,23 +601,28 @@
 //   node attr, file and dir
 //
 // attr lifecycle:
-//   seen in both -- -->mark merge cases
-//   live in one and unseen in other
-//   dead in one and unseen in other
+//   seen in both -->mark merge cases, above
+//   live in one and unseen in other -->live
+//   dead in one and unseen in other -->dead
 //
 // two diff nodes with same name
 // directory loops
 // orphans
 // name collision on root dir
+// illegal node ("MT")
+// missing root dir
 //
 // interactions:
 //   in-node name conflict + possible between-node name conflict
 //   in-node name conflict + both possible names orphaned
 //   in-node name conflict + directory loop conflict
+//   in-node name conflict + one name illegal
 //   between-node name conflict + both nodes orphaned
 //   between-node name conflict + both nodes cause loop
+//   between-node name conflict + both nodes illegal
 
-// need roster, marking, birth revs, and uncommon ancestors for each side...
+// to run roster_merge, need roster, marking, birth revs, and uncommon
+// ancestors for each side...
 
 namespace
 {