# 
# patch "ChangeLog"
#  from [dab94ee29cfd692c0edd8f90bdf3a94427502b18]
#    to [5af774647ef89a05a28f22187696844d1068aada]
# 
# patch "revision.cc"
#  from [6aaebd5acedae74764deb90ce73ecccfd389e8be]
#    to [5a02450e4801bc630e837aa9726cfb4d36b2e3a6]
# 
========================================================================
--- ChangeLog	dab94ee29cfd692c0edd8f90bdf3a94427502b18
+++ ChangeLog	5af774647ef89a05a28f22187696844d1068aada
@@ -1,5 +1,10 @@
 2005-08-24  Nathaniel Smith  <address@hidden>
 
+	* revision.cc (check_sane_history): Add MM's for calculated
+	changesets.
+
+2005-08-24  Nathaniel Smith  <address@hidden>
+
 	* database.cc (assert_sqlite3_ok): Don't print the raw sqlite
 	error code.  Do add some auxiliary information when sqlite errors
 	are confusing.
========================================================================
--- revision.cc	6aaebd5acedae74764deb90ce73ecccfd389e8be
+++ revision.cc	5a02450e4801bc630e837aa9726cfb4d36b2e3a6
@@ -255,6 +255,10 @@
       // that we haven't yet figured out whether this is a valid merge or
       // not.  so find out.
       change_set cs_parent_left, cs_parent_right, cs_left, cs_right;
+      MM(cs_parent_left);
+      MM(cs_parent_right);
+      MM(cs_left);
+      MM(cs_right);
       calculate_composite_change_set(lca, parent_left, app, cs_parent_left);
       calculate_composite_change_set(lca, parent_right, app, cs_parent_right);
       concatenate_change_sets(cs_parent_left, left_edge, cs_left);