# 
# 
# patch "ChangeLog"
#  from [5405c83380e1813dade86cd327e116bc5c72a09b]
#    to [f4748704d7b2d3cba91fddb5d0d584b502b64dbb]
# 
# patch "roster.cc"
#  from [58d2dba402a7b908ea0153d72f2432ec6bc0c5b1]
#    to [10951343bda88f90980ea365b580d3efb12869d3]
# 
============================================================
--- ChangeLog	5405c83380e1813dade86cd327e116bc5c72a09b
+++ ChangeLog	f4748704d7b2d3cba91fddb5d0d584b502b64dbb
@@ -1,3 +1,7 @@
+2006-01-12  Nathaniel Smith  <address@hidden>
+
+	* roster.cc (make_roster_for_merge): Add more MM()'s.
+
 2006-01-11  Nathaniel Smith  <address@hidden>
 
 	* commands.cc (diff): gettext'ify the "no changes" tag.
============================================================
--- roster.cc	58d2dba402a7b908ea0153d72f2432ec6bc0c5b1
+++ roster.cc	10951343bda88f90980ea365b580d3efb12869d3
@@ -1506,12 +1506,26 @@
     I(left_uncommon_ancestors.find(right_rid) == left_uncommon_ancestors.end());
     I(right_uncommon_ancestors.find(right_rid) != right_uncommon_ancestors.end());
     I(right_uncommon_ancestors.find(left_rid) == right_uncommon_ancestors.end());
+    MM(left_rid);
+    MM(left_roster);
+    MM(left_markings);
+    MM(left_cs);
+    MM(left_uncommon_ancestors);
+    MM(right_rid);
+    MM(right_roster);
+    MM(right_markings);
+    MM(right_cs);
+    MM(right_uncommon_ancestors);
+    MM(new_rid);
+    MM(new_roster);
+    MM(new_markings);
     {
       temp_node_id_source temp_nis;
       // SPEEDUP?: the copies on the next two lines are probably the main
       // bottleneck in this code
       new_roster = left_roster;
       roster_t from_right_r(right_roster);
+      MM(from_right_r);
 
       editable_roster_for_merge from_left_er(new_roster, temp_nis);
       editable_roster_for_merge from_right_er(from_right_r, temp_nis);