# # patch "commands.cc" # from [c15dd9a694aebb0bebe23a1151f296f3cbf3aa42] # to [e53739dc1001e0e73bbe655a648fe6826d26c2e4] # # patch "monotone.cc" # from [991e16d662bb7a7555a3fc8ef7322d034ae07951] # to [9096ed2a5835aef0ee06862677a87e027f61e6c0] # # patch "options.hh" # from [4c2651f57f221b2224b9a9dca93a4b1e9c99b281] # to [bfc5813b17b03f5ea62e0520a3d3e3ef5185cb8a] # --- commands.cc +++ commands.cc @@ -3612,7 +3612,7 @@ // missing: compression level (-z), cvs-branch (-r), since (-D) CMD(cvs_pull, "network", "[CVS-REPOSITORY CVS-MODULE]", - "(re-)import a module from a remote cvs repository") + "(re-)import a module from a remote cvs repository", OPT_BRANCH_NAME % OPT_SINCE) { if (args.size() != 2 && args.size() != 0) throw usage(name); @@ -3629,7 +3629,7 @@ CMD(cvs_push, "network", "CVS-REPOSITORY CVS-MODULE", - "commit changes in local database to a remote cvs repository") + "commit changes in local database to a remote cvs repository", OPT_BRANCH_NAME % OPT_SINCE) { if (args.size() != 2 && args.size() != 0) throw usage(name); @@ -3644,7 +3644,7 @@ CMD(cvs_admin, "network", "COMMAND ARG", - "e.g. manifest REVISION") + "e.g. manifest REVISION", OPT_BRANCH_NAME) { if (args.size() != 2) throw usage(name); cvs_sync::admin(idx(args, 0)(), idx(args, 1)(), app); --- monotone.cc +++ monotone.cc @@ -27,7 +27,6 @@ #include "ui.hh" #include "mt_version.hh" #include "options.hh" -#define OPT_SINCE 9999 // use a custom number ... // main option processing and exception handling code --- options.hh +++ options.hh @@ -30,3 +30,4 @@ #define OPT_ALL_FILES 21 #define OPT_PIDFILE 22 #define OPT_MSGFILE 23 +#define OPT_SINCE 99 // use a custom number ...