changeset 45774 | 450e17e59603 |
parent 45765 | ed84a4d48910 |
child 45783 | 88a47cbf063c |
--- a/mercurial/commands.py Tue Oct 27 10:06:17 2020 -0700 +++ b/mercurial/commands.py Thu Oct 15 22:23:02 2020 -0700 @@ -2015,8 +2015,7 @@ opts = pycompat.byteskwargs(opts) if opts.get(b'subrepos'): - if opts.get(b'amend'): - raise error.Abort(_(b'cannot amend with --subrepos')) + cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend']) # Let --subrepos on the command line override config setting. ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')