# 
# 
# patch "ChangeLog"
#  from [c6b4b456b4baf38ffa9f2c83605fac9a67e94e74]
#    to [0cffe0da4b27cfcf1e6edc26647609fedc1f055b]
# 
# patch "roster.cc"
#  from [154575704f1a004137ef81787e9adc2fe817aa75]
#    to [cd44c7d5bd71679b65147d0d3fcfa209ccac223d]
# 
# patch "roster.hh"
#  from [5eaa63b6505d4dbaa4814ab1316e1148e224c45a]
#    to [2cf4ce51917bd9e79cf18e698cafc40cf1f7ee28]
# 
============================================================
--- ChangeLog	c6b4b456b4baf38ffa9f2c83605fac9a67e94e74
+++ ChangeLog	0cffe0da4b27cfcf1e6edc26647609fedc1f055b
@@ -1,5 +1,10 @@
 2006-07-09  Nathaniel Smith  <address@hidden>
 
+	* roster.cc (check_sane_against): Take a temp_nodes_ok arg.
+	(mark_roster_with_one_parent): Pass it.
+
+2006-07-09  Nathaniel Smith  <address@hidden>
+
 	* cmd_merging.cc (pluck): Restructure to handle nids correctly.
 	* tests/pluck_lifecycle/__driver__.lua: Fix and un-xfail.
 	* roster.hh (make_roster_for_base_plus_cset): Fix typo.
============================================================
--- roster.cc	154575704f1a004137ef81787e9adc2fe817aa75
+++ roster.cc	cd44c7d5bd71679b65147d0d3fcfa209ccac223d
@@ -859,10 +859,10 @@
 }
 
 void
-roster_t::check_sane_against(marking_map const & markings) const
+roster_t::check_sane_against(marking_map const & markings, bool temp_nodes_ok) const
 {
 
-  check_sane();
+  check_sane(temp_nodes_ok);
 
   node_map::const_iterator ri;
   marking_map::const_iterator mi;
@@ -1752,7 +1752,7 @@
       safe_insert(child_markings, std::make_pair(i->first, new_marking));
     }
 
-  child.check_sane_against(child_markings);
+  child.check_sane_against(child_markings, true);
 }
 
 // WARNING: this function is not tested directly (no unit tests).  Do not put
============================================================
--- roster.hh	5eaa63b6505d4dbaa4814ab1316e1148e224c45a
+++ roster.hh	2cf4ce51917bd9e79cf18e698cafc40cf1f7ee28
@@ -222,7 +222,7 @@
 
   // verify that this roster is sane, and corresponds to the given
   // marking map
-  void check_sane_against(marking_map const & marks) const;
+  void check_sane_against(marking_map const & marks, bool temp_nodes_ok=false) const;
 
   void print_to(basic_io::printer & pr,
                 marking_map const & mm,