#
#
# patch "mtn-sanity.cc"
#  from [fbf7865df38f708c1de77ce748cf878932fe6330]
#    to [7267ac5add37473eed1435b771905fb820f11c46]
# 
# patch "mtn-sanity.hh"
#  from [cf7b9e3aac03ea17fb0121e75af96e9df4a152d7]
#    to [6efc93a1a859ac94800cdb4c0565383006a5d59d]
# 
# patch "revision.cc"
#  from [b262b0ff0aaed2a707704268a57ba9ccf5d97a24]
#    to [3d6094615888da02c8183c79826e2fe538295caf]
#
============================================================
--- mtn-sanity.cc	fbf7865df38f708c1de77ce748cf878932fe6330
+++ mtn-sanity.cc	7267ac5add37473eed1435b771905fb820f11c46
@@ -1,13 +1,13 @@ extern sanity & global_sanity;
 #include "base.hh"
 #include "mtn-sanity.hh"
 #include "ui.hh"
 #include "mt_version.hh"
 
 extern sanity & global_sanity;
-mtn_sanity real_sanity;
+static mtn_sanity real_sanity;
 sanity & global_sanity = real_sanity;
 
-mtn_sanity::mtn_sanity() : relaxed(false)
+mtn_sanity::mtn_sanity()
 {}
 
 mtn_sanity::~mtn_sanity()
@@ -24,12 +24,6 @@ void
 }
 
 void
-mtn_sanity::set_relaxed(bool rel)
-{
-  relaxed = rel;
-}
-
-void
 mtn_sanity::inform_log(std::string const &msg)
 {
   ui.inform(msg);
============================================================
--- mtn-sanity.hh	cf7b9e3aac03ea17fb0121e75af96e9df4a152d7
+++ mtn-sanity.hh	6efc93a1a859ac94800cdb4c0565383006a5d59d
@@ -5,14 +5,10 @@ struct mtn_sanity : public sanity
 
 struct mtn_sanity : public sanity
 {
-  bool relaxed;
-
   mtn_sanity();
   ~mtn_sanity();
   void initialize(int, char **, char const *);
 
-  void set_relaxed(bool rel);
-
 private:
   void inform_log(std::string const &msg);
   void inform_message(std::string const &msg);
@@ -20,8 +16,6 @@ private:
   void inform_error(std::string const &msg);
 };
 
-extern mtn_sanity real_sanity;
-
 #endif
 
 
============================================================
--- revision.cc	b262b0ff0aaed2a707704268a57ba9ccf5d97a24
+++ revision.cc	3d6094615888da02c8183c79826e2fe538295caf
@@ -34,7 +34,7 @@
 #include "keys.hh"
 #include "numeric_vocab.hh"
 #include "revision.hh"
-#include "mtn-sanity.hh"
+#include "sanity.hh"
 #include "transforms.hh"
 #include "simplestring_xform.hh"
 #include "ui.hh"
@@ -1646,7 +1646,6 @@ build_roster_style_revs_from_manifest_st
   app.db.ensure_open_for_format_changes();
   app.db.check_is_not_rosterified();
 
-  real_sanity.set_relaxed(true);
   anc_graph graph(true, app);
 
   P(F("converting existing revision graph to new roster-style revisions"));
@@ -1691,7 +1690,6 @@ build_roster_style_revs_from_manifest_st
       graph.add_node_for_oldstyle_revision(*i);
     }
 
-  real_sanity.set_relaxed(false);
   graph.rebuild_ancestry();
 }