Mercurial > hg
diff tests/test-graft-interrupted.t @ 45014:6118ad07b98d
graft: leverage cmdutil.check_incompatible_arguments() for --abort/--stop
Differential Revision: https://phab.mercurial-scm.org/D8669
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 25 Jun 2020 13:37:56 -0700 |
| parents | c63a297fb964 |
| children | 85b03b1e4715 |
line wrap: on
line diff
--- a/tests/test-graft-interrupted.t Thu Jun 25 13:29:05 2020 -0700 +++ b/tests/test-graft-interrupted.t Thu Jun 25 13:37:56 2020 -0700 @@ -253,13 +253,13 @@ [255] $ hg graft --stop -U - abort: cannot specify any other flag with '--stop' + abort: cannot specify both --stop and --user [255] $ hg graft --stop --rev 4 - abort: cannot specify any other flag with '--stop' + abort: cannot specify both --stop and --rev [255] $ hg graft --stop --log - abort: cannot specify any other flag with '--stop' + abort: cannot specify both --stop and --log [255] $ hg graft --stop @@ -363,11 +363,11 @@ [255] $ hg graft --abort --currentuser - abort: cannot specify any other flag with '--abort' + abort: cannot specify both --abort and --user [255] $ hg graft --abort --edit - abort: cannot specify any other flag with '--abort' + abort: cannot specify both --abort and --edit [255] #if abortcommand