# # # patch "options_list.hh" # from [031ddc60f940a37d827123f9f8963cf8a233a33a] # to [db9e6c7bea2a8519bc1cab5dbbd685d3e256aaa0] # # patch "tests/suspend/__driver__.lua" # from [abfe00e901c6b421535de734ef4725027e1ba49a] # to [dc12e9e387a9f96fb7c0d4e27745cbbed087e8f9] # ============================================================ --- options_list.hh 031ddc60f940a37d827123f9f8963cf8a233a33a +++ options_list.hh db9e6c7bea2a8519bc1cab5dbbd685d3e256aaa0 @@ -282,7 +282,7 @@ OPTION(include, include, true, "include" } #endif -GOPT(ignore_suspend_certs, "ignore_suspend_certs", bool, false, +GOPT(ignore_suspend_certs, "ignore-suspend-certs", bool, false, gettext_noop("Do not ignore revisions marked as suspended")) #ifdef option_bodies { ============================================================ --- tests/suspend/__driver__.lua abfe00e901c6b421535de734ef4725027e1ba49a +++ tests/suspend/__driver__.lua dc12e9e387a9f96fb7c0d4e27745cbbed087e8f9 @@ -18,7 +18,7 @@ check(samelines("stdout", {})) check(mtn("automate", "heads"), 0, true, false) check(samelines("stdout", {})) -check(mtn("automate", "heads", "--ignore_suspend_certs"), 0, true, false) +check(mtn("automate", "heads", "--ignore-suspend-certs"), 0, true, false) check(samelines("stdout", {REV2})) -- but still allows children to be committed @@ -78,7 +78,7 @@ check(mtn("up", "-r", OREV1, "-b", "othe -- Check that update complains in that case if we're ignoring suspend certs check(mtn("up", "-r", OREV1, "-b", "otherbranch"), 0, false, false) -check(mtn("up", "--ignore_suspend_certs"), 1, false, false) +check(mtn("up", "--ignore-suspend-certs"), 1, false, false) check(base_revision() == OREV1) -- Check that update complains about multiple heads when all candidates are suspended @@ -93,6 +93,6 @@ check(samelines("stdout", {"testbranch"} check(mtn("ls", "branches"), 0, true, true) check(samelines("stdout", {"testbranch"})) -check(mtn("ls", "branches", "--ignore_suspend_certs"), 0, true, true) +check(mtn("ls", "branches", "--ignore-suspend-certs"), 0, true, true) check(samelines("stdout", {"otherbranch", "testbranch"}))