# 
# patch "change_set.cc"
#  from [4779ebed100cf01080bbb20ad5c1f9406d81dafc]
#    to [8b9ede4bf381e207b8bd3c8f61b3087474d5c0ed]
# 
# patch "revision.cc"
#  from [b365c3876cf86f508a78656fcf73acc1bf4411c1]
#    to [b3ece1f5f6cc636fcccd5b10f5372c36a0100f6b]
# 
# patch "sanity.hh"
#  from [bc449c279746c70f6cfa69f7854b479684744078]
#    to [6b56adc96cdc67cfec9cb5e0d6cc5c1cc1e3f823]
# 
===============================================
--- change_set.cc	4779ebed100cf01080bbb20ad5c1f9406d81dafc
+++ change_set.cc	8b9ede4bf381e207b8bd3c8f61b3087474d5c0ed
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil -*-
 // copyright (C) 2004 graydon hoare <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
@@ -474,7 +475,7 @@
 {
   // FIXME: extend this as you manage to think of more invariants
   // which are cheap enough to check at this level.
-  M(*this);
+  MM(*this);
 
   rearrangement.check_sane(this->deltas);
 
@@ -1490,9 +1491,9 @@
                         change_set const & b,
                         change_set & concatenated)
 {
-  M(a);
-  M(b);
-  M(concatenated);
+  MM(a);
+  MM(b);
+  MM(concatenated);
   a.check_sane();
   b.check_sane();
 
@@ -2197,10 +2198,10 @@
                   merge_provider & merger,
                   app_state & app)
 {
-  M(a);
-  M(b);
-  M(a_merged);
-  M(b_merged);
+  MM(a);
+  MM(b);
+  MM(a_merged);
+  MM(b_merged);
   a.check_sane();
   b.check_sane();
 
@@ -2270,9 +2271,9 @@
                   manifest_map const & a_map,
                   change_set & b2a)
 {
-  M(a2b);
-  M(a_map);
-  M(b2a);
+  MM(a2b);
+  MM(a_map);
+  MM(b2a);
   a2b.check_sane();
   tid_source ts;
   path_analysis a2b_analysis, b2a_analysis;
===============================================
--- revision.cc	b365c3876cf86f508a78656fcf73acc1bf4411c1
+++ revision.cc	b3ece1f5f6cc636fcccd5b10f5372c36a0100f6b
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil -*-
 // copyright (C) 2004 graydon hoare <address@hidden>
 // all rights reserved.
 // licensed to the public under the terms of the GNU GPL (>= 2)
@@ -176,14 +177,14 @@
                                           *current_to_child_changes_p,
                                           *old_to_child_changes_p);
                 }
-              M(*old_to_child_changes_p);
+	      MM(*old_to_child_changes_p);
 
               // we have the change_set; now, is it one we've seen before?
               if (changesets.find(old_id) != changesets.end())
                 {
                   // If it is, then make sure the paths agree on the
                   // changeset.
-                  M(*changesets.find(old_id)->second);
+		  MM(*changesets.find(old_id)->second);
                   I(*changesets.find(old_id)->second == *old_to_child_changes_p);
                 }
               else
@@ -199,8 +200,8 @@
                   if (!null_id(old_id))
                     app.db.get_manifest(m_old_id, purported_m_child);
                   apply_change_set(*old_to_child_changes_p, purported_m_child);
-                  M(purported_m_child);
-                  M(m_child);
+		  MM(purported_m_child);
+		  MM(m_child);
                   I(purported_m_child == m_child);
                 }
             }
===============================================
--- sanity.hh	bc449c279746c70f6cfa69f7854b479684744078
+++ sanity.hh	6b56adc96cdc67cfec9cb5e0d6cc5c1cc1e3f823
@@ -1,3 +1,4 @@
+// -*- mode: C++; c-file-style: "gnu"; indent-tabs-mode: nil -*-
 #ifndef __SANITY_HH__
 #define __SANITY_HH__
 
@@ -244,7 +245,7 @@
 // being passed to real_M.
 #define real_M(obj, line) Musing<typeof(obj)> this_is_a_musing_fnord_object_ ## line (obj, #obj, __FILE__, __LINE__, __PRETTY_FUNCTION__)
 #define fake_M(obj, line) real_M(obj, line)
-#define M(obj) fake_M(obj, __LINE__)
+#define MM(obj) fake_M(obj, __LINE__)
 
 void dump(std::string const & obj, std::string & out);