# 
# patch "ChangeLog"
#  from [4c57466691fa535baf0f4f2ff36b08689758ceee]
#    to [887dcb43f2dd028ba6829be1b936290cef8cb0bf]
# 
# patch "change_set.cc"
#  from [38917404bd14c8ba874b57ac1069cb15332e1043]
#    to [4779ebed100cf01080bbb20ad5c1f9406d81dafc]
# 
===============================================
--- ChangeLog	4c57466691fa535baf0f4f2ff36b08689758ceee
+++ ChangeLog	887dcb43f2dd028ba6829be1b936290cef8cb0bf
@@ -1,5 +1,10 @@
 2005-07-24  Nathaniel Smith  <address@hidden>
 
+	* change_set.cc (merge_change_sets, check_sane)
+	(concatenate_change_sets, invert_change_set): Add M()s.
+
+2005-07-24  Nathaniel Smith  <address@hidden>
+
 	* sanity.{hh,cc} (dump): Remove templated version, add std::string
 	version.
 	* vocab.{hh,cc} (dump): Add ATOMIC/DECORATE/ENCODING dumpers.
===============================================
--- change_set.cc	38917404bd14c8ba874b57ac1069cb15332e1043
+++ change_set.cc	4779ebed100cf01080bbb20ad5c1f9406d81dafc
@@ -474,6 +474,7 @@
 {
   // FIXME: extend this as you manage to think of more invariants
   // which are cheap enough to check at this level.
+  M(*this);
 
   rearrangement.check_sane(this->deltas);
 
@@ -1489,6 +1490,9 @@
                         change_set const & b,
                         change_set & concatenated)
 {
+  M(a);
+  M(b);
+  M(concatenated);
   a.check_sane();
   b.check_sane();
 
@@ -2193,6 +2197,10 @@
                   merge_provider & merger,
                   app_state & app)
 {
+  M(a);
+  M(b);
+  M(a_merged);
+  M(b_merged);
   a.check_sane();
   b.check_sane();
 
@@ -2262,6 +2270,9 @@
                   manifest_map const & a_map,
                   change_set & b2a)
 {
+  M(a2b);
+  M(a_map);
+  M(b2a);
   a2b.check_sane();
   tid_source ts;
   path_analysis a2b_analysis, b2a_analysis;