# 
# delete_file "roster.cc"
# 
# delete_file "roster.hh"
# 
# delete_file "roster2.cc"
# 
# delete_file "roster2.hh"
# 
# delete_file "roster3.cc"
# 
# delete_file "roster3.hh"
# 
# rename_file "roster4.cc"
#          to "roster.cc"
# 
# rename_file "roster4.hh"
#          to "roster.hh"
# 
# patch "Makefile.am"
#  from [6f9c86642b70e33eb2a743bc13af79c1afc26f0c]
#    to [b1aa84ddfe5c38aaf56dfbf3aea64d1861fe4488]
# 
# patch "database.hh"
#  from [cd0bfbd78e434d93784fa21cd7e565f6e035497e]
#    to [6fd4a6e25c6a992c468cdf6a9a7385e433394992]
# 
# patch "roster.cc"
#  from [0c9d5181a27495642167f7b42742c2fbedd375f6]
#    to [bb60fefefef70fdef968215f356fdfcab15670f8]
# 
# patch "transforms.hh"
#  from [a8097a706f9b6f087fb20213bd0002cae79fe844]
#    to [70884b41fd3e05357fd50dc95decb0571a0d5872]
# 
========================================================================
--- Makefile.am	6f9c86642b70e33eb2a743bc13af79c1afc26f0c
+++ Makefile.am	b1aa84ddfe5c38aaf56dfbf3aea64d1861fe4488
@@ -31,7 +31,7 @@
          rcs_import.cc rcs_import.hh					\
          revision.cc revision.hh					\
 	 cset.cc cset.hh						\
-	 roster4.cc roster4.hh						\
+	 roster.cc roster.hh						\
          mt_version.cc mt_version.hh					\
          automate.cc automate.hh					\
          database_check.cc database_check.hh				\
========================================================================
--- database.hh	cd0bfbd78e434d93784fa21cd7e565f6e035497e
+++ database.hh	6fd4a6e25c6a992c468cdf6a9a7385e433394992
@@ -21,7 +21,7 @@
 #include "manifest.hh"
 #include "numeric_vocab.hh"
 #include "paths.hh"
-#include "roster4.hh"
+#include "roster.hh"
 #include "selectors.hh"
 #include "vocab.hh"
 
@@ -201,11 +201,11 @@
                                         database & db);
 
   void get_roster_id_for_revision(revision_id const & rev_id,
-				  hexenc<id> & roster_id);
+                                  hexenc<id> & roster_id);
 
   void put_roster(revision_id const & rev_id,
-		  roster_t & roster,
-		  marking_map & marks);
+                  roster_t & roster,
+                  marking_map & marks);
 
   void check_filename();
   void open();
@@ -298,10 +298,10 @@
                    revision_data & dat);
 
   void put_revision(revision_id const & new_id,
-		    revision_set const & rev);
+                    revision_set const & rev);
 
   void put_revision(revision_id const & new_id,
-		    revision_data const & dat);
+                    revision_data const & dat);
   
   void delete_existing_revs_and_certs();
 
@@ -431,14 +431,14 @@
   // roster and node_id stuff
  
   void get_roster(revision_id const & rid, 
-		  roster_t & roster,
-		  marking_map & marks);
+                  roster_t & roster,
+                  marking_map & marks);
 
   void get_uncommon_ancestors(revision_id const & a,
-			      revision_id const & b,
-			      std::set<revision_id> & a_uncommon_ancs,
-			      std::set<revision_id> & b_uncommon_ancs);
-			      
+                              revision_id const & b,
+                              std::set<revision_id> & a_uncommon_ancs,
+                              std::set<revision_id> & b_uncommon_ancs);
+                              
   node_id next_node_id();
   
   // completion stuff
========================================================================
--- roster.cc	0c9d5181a27495642167f7b42742c2fbedd375f6
+++ roster.cc	bb60fefefef70fdef968215f356fdfcab15670f8
@@ -14,7 +14,7 @@
 #include "app_state.hh"
 #include "basic_io.hh"
 #include "cset.hh"
-#include "roster4.hh"
+#include "roster.hh"
 #include "revision.hh"
 #include "vocab.hh"
 #include "transforms.hh"
========================================================================
--- transforms.hh	a8097a706f9b6f087fb20213bd0002cae79fe844
+++ transforms.hh	70884b41fd3e05357fd50dc95decb0571a0d5872
@@ -10,7 +10,7 @@
 #include "lua.hh"
 #include "manifest.hh"
 #include "vocab.hh"
-#include "roster4.hh"
+#include "roster.hh"
 
 #include <vector>