#
#
# patch "mtn_cvs/cvs_client.cc"
#  from [25a14cbdfc5ee65053dff9cff2b9a604324c3ace]
#    to [5d7e3478a7a99c55e3122c98c51dc5fcb05db697]
# 
# patch "mtn_cvs/cvs_client.hh"
#  from [e1be2fff144fdf59267c3fb83f0c9a664c5c8465]
#    to [4d43d394b811c34f110f8eb4174b255276b22b47]
# 
# patch "mtn_cvs/cvs_sync_push.cc"
#  from [2f096e40e3bc40af75e298e654f28ca4f648cbf9]
#    to [91a0ea374f726abd437c011f91a4ddefe7881d3c]
# 
# patch "mtn_cvs/options_list.hh"
#  from [7362cd29dc29348c36679b6fedff24d0945433a5]
#    to [501f3906548c56552b6b0aead1471758c42237c9]
#
============================================================
--- mtn_cvs/cvs_client.cc	25a14cbdfc5ee65053dff9cff2b9a604324c3ace
+++ mtn_cvs/cvs_client.cc	5d7e3478a7a99c55e3122c98c51dc5fcb05db697
@@ -1375,7 +1375,7 @@ std::map<std::string,std::pair<std::stri
 
 std::map<std::string,std::pair<std::string,std::string> >
          cvs_client::Commit(const std::string &changelog, time_t when, 
-                    const std::vector<commit_arg> &commits)
+                    const std::vector<commit_arg> &commits, bool checkin_time)
 { primeModules();
   std::string olddir;
   I(!commits.empty());
@@ -1394,7 +1394,7 @@ std::map<std::string,std::pair<std::stri
           +i->old_revision+"//"+i->keyword_substitution+"/"
           +branchpart+"\n");
     if (!i->removed)
-    { writestr("Checkin-time "+time_t2rfc822(when)+"\n");
+    { if (checkin_time) writestr("Checkin-time "+time_t2rfc822(when)+"\n");
       writestr("Modified "+bname+"\n");
       writestr(int2permissions(i->mode)+"\n");
       // do _not_ translate this into locale format (e.g. F() )
============================================================
--- mtn_cvs/cvs_client.hh	e1be2fff144fdf59267c3fb83f0c9a664c5c8465
+++ mtn_cvs/cvs_client.hh	4d43d394b811c34f110f8eb4174b255276b22b47
@@ -166,7 +166,7 @@ public:  
   // returns <filename, <new_revision,keyword_substitution> ("" on remove)>
   std::map<std::string,std::pair<std::string,std::string> >
          Commit(const std::string &changelog, time_t when, 
-                    const std::vector<commit_arg> &commits);
+                    const std::vector<commit_arg> &commits, bool checkin_time);
   // parent_path is module relative
   void AddDirectory(std::string const& name, std::string const& parent_path);
   
============================================================
--- mtn_cvs/cvs_sync_push.cc	2f096e40e3bc40af75e298e654f28ca4f648cbf9
+++ mtn_cvs/cvs_sync_push.cc	91a0ea374f726abd437c011f91a4ddefe7881d3c
@@ -330,7 +330,7 @@ std::set<cvs_edge>::iterator cvs_reposit
     // 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
-      =Commit(changelog,e.time,commits);
+      =Commit(changelog,e.time,commits,!app.opts.no_time);
     if (result.empty()) { fail=true; return edges.end(); }
 
     if (parent!=edges.end())    
============================================================
--- mtn_cvs/options_list.hh	7362cd29dc29348c36679b6fedff24d0945433a5
+++ mtn_cvs/options_list.hh	501f3906548c56552b6b0aead1471758c42237c9
@@ -42,6 +42,13 @@ OPT(full, "full", bool, false, N_("ignor
 }
 #endif
 
+OPT(no_time, "no-time", bool, false, N_("do not send Checkin-time command on push"))
+#ifdef option_bodies
+{
+  no_time = true;
+}
+#endif
+
 OPT(first, "first", bool, false, N_("take first child if choice necessary"))
 #ifdef option_bodies
 {