# # # patch "mtn_cvs/cvs_sync_push.cc" # from [91a0ea374f726abd437c011f91a4ddefe7881d3c] # to [c38afdc462021c4a36fd88f863d566aff1163ebb] # # patch "mtn_cvs/mtn_cvs.cc" # from [0a6d98189e233c13cb8a11fe8364fbdc41243841] # to [f669fa6b60bbe5118f922fde6f5a33abf5137515] # ============================================================ --- mtn_cvs/cvs_sync_push.cc 91a0ea374f726abd437c011f91a4ddefe7881d3c +++ mtn_cvs/cvs_sync_push.cc c38afdc462021c4a36fd88f863d566aff1163ebb @@ -202,6 +202,7 @@ std::set::iterator cvs_reposit } // a bit like process_certs cvs_edge e(rid,app); + revision_id last_cvs_revision; mtn_automate::revision_t rs=app.get_revision(rid); std::vector commits; @@ -333,7 +334,7 @@ std::set::iterator cvs_reposit =Commit(changelog,e.time,commits,!app.opts.no_time); if (result.empty()) { fail=true; return edges.end(); } - if (parent!=edges.end()) + if (parent!=edges.end()) e.delta_base=parent->revision; // the result of the commit: create history entry (file state) ============================================================ --- mtn_cvs/mtn_cvs.cc 0a6d98189e233c13cb8a11fe8364fbdc41243841 +++ mtn_cvs/mtn_cvs.cc f669fa6b60bbe5118f922fde6f5a33abf5137515 @@ -111,7 +111,7 @@ CMD(push, "push", "", CMD_REF(network), CMD(push, "push", "", CMD_REF(network), N_("[CVS-REPOSITORY CVS-MODULE [CVS-BRANCH]]"), N_("commit changes in local database to a remote cvs repository"), "", - options::opts::branch | options::opts::revision | options::opts::first) + options::opts::branch | options::opts::revision | options::opts::first | options::opts::no_time) { if (args.size() == 1 || args.size() > 3) throw usage(execid);