Submitter | phabricator |
---|---|
Date | Oct. 16, 2020, 6:03 a.m. |
Message ID | <differential-rev-PHID-DREV-gkk7bsyearatrcnmod7y-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47475/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -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')