# # # patch "mtn_cvs/cvs_sync.cc" # from [b955f0b710fbf75c526c1930cc5328f824d3d5e7] # to [b4a1c3a5e813c5cd8ad5615d20bece0c67881260] # # patch "mtn_cvs/mtn_cvs.cc" # from [33b59c42628e132428e54dfc2132e997ac9efbd3] # to [1dd846d33754c382e9c7b431ddba0822aaa94cad] # # patch "mtn_cvs/options_list.hh" # from [006d75ccf96a01f649bb415437235328bf0e0802] # to [364fd8dcbf1eb6313a23febe62d544a31240e75b] # ============================================================ --- mtn_cvs/cvs_sync.cc b955f0b710fbf75c526c1930cc5328f824d3d5e7 +++ mtn_cvs/cvs_sync.cc b4a1c3a5e813c5cd8ad5615d20bece0c67881260 @@ -33,7 +33,7 @@ using namespace std; using namespace std; // -> investigate under which conditions a string gets copied -static std::string const cvs_cert_name="cvs-revisions"; +//static std::string const cvs_cert_name="cvs-revisions"; using namespace cvs_sync; @@ -1123,7 +1123,7 @@ void cvs_repository::commit() } if (children.empty()) return; revision_id next; - if (children.size()>1) // && !ap.revision_selectors.size()) + if (children.size()>1 && !app.opts.first) { for (std::vector::const_iterator i=app.opts.revisions.begin(); i!=app.opts.revisions.end();++i) { for (std::vector::const_iterator j=children.begin(); ============================================================ --- mtn_cvs/mtn_cvs.cc 33b59c42628e132428e54dfc2132e997ac9efbd3 +++ mtn_cvs/mtn_cvs.cc 1dd846d33754c382e9c7b431ddba0822aaa94cad @@ -114,7 +114,7 @@ CMD(push, N_("network"), N_("[CVS-REPOSI CMD(push, N_("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::branch | options::opts::revision | options::opts::first) { if (args.size() == 1 || args.size() > 3) throw usage(name); ============================================================ --- mtn_cvs/options_list.hh 006d75ccf96a01f649bb415437235328bf0e0802 +++ mtn_cvs/options_list.hh 364fd8dcbf1eb6313a23febe62d544a31240e75b @@ -38,6 +38,13 @@ OPT(full, "full", bool, false, N_("ignor } #endif +OPT(first, "first", bool, false, N_("take first child if choice necessary")) +#ifdef option_bodies +{ + first = true; +} +#endif + OPTVAR(revision, std::vector, revisions, ) OPTION(revision, revision, true, "revision,r", N_("select revision id(s) for operation"))