# 
# 
# patch "ChangeLog"
#  from [b0091dbc729c1bec0240ee0ba7fffcb34af27651]
#    to [88276b7365b65793fead29f04f40631bc3248eba]
# 
# patch "roster_merge.cc"
#  from [07988550bd447a95fb3bb6dd52816364c60caa62]
#    to [aa38469bceafec9e94d2ba9c291cf08d6fc90e06]
# 
============================================================
--- ChangeLog	b0091dbc729c1bec0240ee0ba7fffcb34af27651
+++ ChangeLog	88276b7365b65793fead29f04f40631bc3248eba
@@ -1,5 +1,9 @@
 2006-02-19  Nathaniel Smith  <address@hidden>
 
+	* roster_merge.cc (make_lifecycle_objs): Fix test bug.
+
+2006-02-19  Nathaniel Smith  <address@hidden>
+
 	* roster.cc (shallow_equal): Publically expose.
 	* roster.cc, roster_merge.cc: Various compile fixes.
 	
============================================================
--- roster_merge.cc	07988550bd447a95fb3bb6dd52816364c60caa62
+++ roster_merge.cc	aa38469bceafec9e94d2ba9c291cf08d6fc90e06
@@ -169,6 +169,10 @@
         result = left;
         return true;
       }
+    MM(left_marks);
+    MM(left_uncommon_ancestors);
+    MM(right_marks);
+    MM(right_uncommon_ancestors);
     bool left_wins = a_wins(right_marks, right_uncommon_ancestors);
     bool right_wins = a_wins(left_marks, left_uncommon_ancestors);
     // two bools means 4 cases:
@@ -631,8 +635,8 @@
                     std::string const & name, node_id common_dir_nid, node_id common_file_nid,
                     node_id & safe_dir_nid, node_id & safe_file_nid, node_id_source & nis)
 {
-  make_dir(r, markings, common1, common1, name + "_old_dir", common_dir_nid);
-  make_file(r, markings, common1, common1, common1, name + "_old_file", fid1, common_file_nid);
+  make_dir(r, markings, common1, common1, "common_old_dir", common_dir_nid);
+  make_file(r, markings, common1, common1, common1, "common_old_file", fid1, common_file_nid);
   safe_dir_nid = nis.next();
   make_dir(r, markings, uncommon, uncommon, name + "_safe_dir", safe_dir_nid);
   safe_file_nid = nis.next();