# 
# 
# patch "roster.cc"
#  from [76370633226239e55a7b24adf00727d26fe520d3]
#    to [c28f199c9e85fccf5714d2348389d9c4997ac2bc]
# 
============================================================
--- roster.cc	76370633226239e55a7b24adf00727d26fe520d3
+++ roster.cc	c28f199c9e85fccf5714d2348389d9c4997ac2bc
@@ -3972,13 +3972,15 @@
       == has_roster.get_node(split("foo"))->self);
   }
   // added in merge
+  // this is a little "clever", it uses the same has_not_roster twice, but the
+  // second time it passes the has_rid, to make it a possible graph.
   {
     roster_t new_roster; MM(new_roster);
     marking_map new_markings; MM(new_markings);
     make_roster_for_merge(has_not_rid, has_not_roster, has_not_markings, add_cs,
                           singleton(has_not_rid),
-                          has_not_rid, has_not_roster, has_not_markings, add_cs,
-                          singleton(has_not_rid),
+                          has_rid, has_not_roster, has_not_markings, add_cs,
+                          singleton(has_rid),
                           new_rid, new_roster, new_markings,
                           nis);
     I(new_roster.get_node(split("foo"))->self