# 
# 
# patch "mtn_cvs/cvs_sync.cc"
#  from [b1ae4ce73bf1290be9bd15795b3788e186b1cfa5]
#    to [5739a5ac1828a6b09498ae877742273024ab9144]
# 
============================================================
--- mtn_cvs/cvs_sync.cc	b1ae4ce73bf1290be9bd15795b3788e186b1cfa5
+++ mtn_cvs/cvs_sync.cc	5739a5ac1828a6b09498ae877742273024ab9144
@@ -146,11 +146,9 @@ std::string debug_files(const std::map<s
     result += " (";
     for (std::set<file_state>::const_iterator j=i->second.known_states.begin();
           j!=i->second.known_states.end();)
-    { result +=  boost::lexical_cast<string>(j->since_when%1000) + ":" + j->cvs_version + "=";
-      if (j->dead) result +=  "dead";
-      else if (j->size) result +=  boost::lexical_cast<string>(j->size);
-      else if (j->patchsize) result +=  'p' + boost::lexical_cast<string>(j->patchsize);
-      else if (!j->sha1sum().empty()) result +=  j->sha1sum().substr(0,4) + j->keyword_substitution;
+    { string toadd;
+      dump(*j,toadd);
+      result+=toadd;
       ++j;
       if (j!=i->second.known_states.end()) result += ",";
     }
@@ -217,10 +215,9 @@ std::string cvs_repository::debug() cons
     result+= " (";
     for (std::set<file_state>::const_iterator j=i->second.known_states.begin();
           j!=i->second.known_states.end();)
-    { if (j->dead) result+= "dead";
-      else if (j->size) result+= boost::lexical_cast<string>(j->size);
-      else if (j->patchsize) result+= "p" + boost::lexical_cast<string>(j->patchsize);
-      else if (!j->sha1sum().empty()) result+= j->sha1sum().substr(0,4) + j->keyword_substitution;
+    { std::string toadd;
+      dump(*j,toadd);
+      result+=toadd;
       ++j;
       if (j!=i->second.known_states.end()) result+= ",";
     }
@@ -422,7 +419,7 @@ void cvs_repository::store_update(std::s
     unsigned hashidx=hash.OUTPUT_LENGTH;
     for (;hashidx && hashval[hashidx-1]==Botan::byte(md5sum[hashidx-1]);--hashidx) ;
     if (!hashidx)
-    { //store_delta(contents, old_contents, u.patch, s->sha1sum, const_cast<hexenc<id>&>(s2->sha1sum));
+    { store_delta(contents, old_contents, u.patch, s->sha1sum, const_cast<hexenc<id>&>(s2->sha1sum));
     }
     else
     { E(false, F("MD5 sum %s<>%s") % u.checksum 
@@ -582,9 +579,11 @@ void cvs_repository::fill_manifests(std:
       }
       else // file was present in last manifest, check whether next revision already fits
       {
+        MM(mi->first);
         cvs_file_state s=mi->second;
         MM(*s);
         ++s;
+        MM(*s);
         if (s!=f->second.known_states.end() 
             && (*s)<=(*e)
             && ( next_edge==edges.end() || ((*s)<(*next_edge)) ) )