# 
# 
# patch "roster.cc"
#  from [efb6521ea9614bc9be8231de22429871ab582e9e]
#    to [b16a3d40dbfa61ea29145bf152c5ad64318ad18f]
# 
# patch "roster.hh"
#  from [30e2549f615b085edd2453158fcc5586e5a64116]
#    to [3f9f5a968cbce9abd0199a75eda87d36da7ff485]
# 
============================================================
--- roster.cc	efb6521ea9614bc9be8231de22429871ab582e9e
+++ roster.cc	b16a3d40dbfa61ea29145bf152c5ad64318ad18f
@@ -885,6 +885,16 @@
       else
         I(mi->second.file_content.empty());
 
+      full_attr_map_t::const_iterator rai;
+      std::map<attr_key, std::set<revision_id> >::const_iterator mai;
+      for (rai = ri->second->attrs.begin(), mai = mi->second.attrs.begin();
+           rai != ri->second->attrs.end() && mai != mi->second.attrs.end();
+           ++rai, ++mai)
+        {
+          I(rai->first == mai->first);
+          I(!mai->second.empty());
+        }
+      I(rai == ri->second->attrs.end() && mai == mi->second.attrs.end());
       // TODO: attrs
     }
 
============================================================
--- roster.hh	30e2549f615b085edd2453158fcc5586e5a64116
+++ roster.hh	3f9f5a968cbce9abd0199a75eda87d36da7ff485
@@ -56,7 +56,7 @@
 void dump(full_attr_map_t const & val, std::string & out);
 
 
-struct node 
+struct node
 {
   node();
   node(node_id i);