changeset 43892 | d587937600be |
parent 43875 | 8376d5d62d36 |
child 43895 | 287556e71f85 |
--- a/mercurial/commands.py Fri Dec 13 14:40:52 2019 -0800 +++ b/mercurial/commands.py Thu Dec 12 15:16:13 2019 -0800 @@ -1889,8 +1889,7 @@ Returns 0 on success. """ opts = pycompat.byteskwargs(opts) - if opts.get(b'noupdate') and opts.get(b'updaterev'): - raise error.Abort(_(b"cannot specify both --noupdate and --updaterev")) + cmdutil.check_at_most_one_arg(opts, b'noupdate', b'updaterev') # --include/--exclude can come from narrow or sparse. includepats, excludepats = None, None