#
#
# patch "mtn_cvs/cvs_sync_push.cc"
#  from [01e66d6365f25e0195ce65718363acb2324baa86]
#    to [2f096e40e3bc40af75e298e654f28ca4f648cbf9]
#
============================================================
--- mtn_cvs/cvs_sync_push.cc	01e66d6365f25e0195ce65718363acb2324baa86
+++ mtn_cvs/cvs_sync_push.cc	2f096e40e3bc40af75e298e654f28ca4f648cbf9
@@ -70,7 +70,7 @@ std::string cvs_repository::gather_merge
     }
     result+="-------------------\n"
         +changelog+"\nmtn "+author+" "
-        +cvs_client::time_t2rfc822(date)+" "+encode_hexenc(i->inner()())+"\n";
+        +cvs_client::time_t2rfc822(date)+" "+encode_hexenc(i->inner()()).substr(0,6)+"\n";
     result+=gather_merge_information(*i);
   }
   return result;
@@ -325,8 +325,8 @@ std::set<cvs_edge>::iterator cvs_reposit
       return --(edges.end());
     }
     std::string changelog;
-    changelog=e.changelog+"\nmonotone "+e.author+" "
-        +cvs_client::time_t2rfc822(e.time)+" "+e.revision.inner()().substr(0,6)+"\n";
+    changelog=e.changelog+"\nmtn "+e.author+" "
+        +cvs_client::time_t2rfc822(e.time)+" "+encode_hexenc(e.revision.inner()()).substr(0,6)+"\n";
     // gather information CVS does not know about into the changelog
     changelog+=gather_merge_information(e.revision);
     std::map<std::string,std::pair<std::string,std::string> > result