Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmd_impls/graft.py @ 52369:58827d815646
graft: also forbid "--base" with "--stop" and the like
As "--base" is related to starting a draft, is does not belong to dealing with
an interrupted one.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 28 Nov 2024 14:00:49 +0100 |
| parents | 8faabe8abf66 |
| children | 1802d9afddf7 |
line wrap: on
line diff
--- a/mercurial/cmd_impls/graft.py Thu Nov 28 13:22:31 2024 +0100 +++ b/mercurial/cmd_impls/graft.py Thu Nov 28 14:00:49 2024 +0100 @@ -46,7 +46,7 @@ # argument incompatible with followup from an interrupted operation commit_args = ['edit', 'log', 'user', 'date', 'currentdate', 'currentuser'] - nofollow_args = commit_args + ['rev'] + nofollow_args = commit_args + ['base', 'rev'] arg_compatibilities = [ ('no_commit', commit_args),