# # # patch "cmd.hh" # from [dd0d008ed178f160ecb909907d9fa287ca22e9c1] # to [8f7a32c0b0d73cc8ba17cd49f4e2880a1c27f54f] # # patch "cmd_othervcs.cc" # from [011da227e2639852ae0bb23e263c91031a18d026] # to [7b312de1b760a8ec9516b34e5cc2c64b88d400b7] # # patch "commands.cc" # from [aa02dcafea0bae5e50764d2e9d0b59fbdc9f5d14] # to [a38f7f886bc70e27fab40d95fac3570cefb394f5] # ============================================================ --- cmd.hh dd0d008ed178f160ecb909907d9fa287ca22e9c1 +++ cmd.hh 8f7a32c0b0d73cc8ba17cd49f4e2880a1c27f54f @@ -286,8 +286,7 @@ CMD_FWD_DECL(packet_io); CMD_FWD_DECL(key_and_cert); CMD_FWD_DECL(network); CMD_FWD_DECL(packet_io); -CMD_FWD_DECL(rcs); -CMD_FWD_DECL(git); +CMD_FWD_DECL(vcs); CMD_FWD_DECL(review); CMD_FWD_DECL(tree); CMD_FWD_DECL(variables); ============================================================ --- cmd_othervcs.cc 011da227e2639852ae0bb23e263c91031a18d026 +++ cmd_othervcs.cc 7b312de1b760a8ec9516b34e5cc2c64b88d400b7 @@ -49,7 +49,7 @@ CMD(rcs_import, "rcs_import", "", CMD_RE } -CMD(cvs_import, "cvs_import", "", CMD_REF(rcs), N_("CVSROOT"), +CMD(cvs_import, "cvs_import", "", CMD_REF(vcs), N_("CVSROOT"), N_("Imports all versions in a CVS repository"), "", options::opts::branch) @@ -220,7 +220,7 @@ namespace }; -CMD(git_export, "git_export", "", CMD_REF(git), N_(""), +CMD(git_export, "git_export", "", CMD_REF(vcs), N_(""), N_("Produces a git fast-export data stream on stdout"), N_(""), options::opts::none) ============================================================ --- commands.cc aa02dcafea0bae5e50764d2e9d0b59fbdc9f5d14 +++ commands.cc a38f7f886bc70e27fab40d95fac3570cefb394f5 @@ -77,12 +77,9 @@ CMD_GROUP(packet_io, "packet_io", "", CM CMD_GROUP(packet_io, "packet_io", "", CMD_REF(__root__), N_("Commands for packet reading and writing"), ""); -CMD_GROUP(rcs, "rcs", "", CMD_REF(__root__), - N_("Commands for interaction with RCS and CVS"), +CMD_GROUP(vcs, "vcs", "", CMD_REF(__root__), + N_("Commands for interaction with other version control systems"), ""); -CMD_GROUP(git, "git", "", CMD_REF(__root__), - N_("Commands for interaction with GIT"), - ""); CMD_GROUP(review, "review", "", CMD_REF(__root__), N_("Commands to review revisions"), "");