changeset 43895 | 287556e71f85 |
parent 43892 | d587937600be |
child 43900 | 3b50de911200 |
--- a/mercurial/commands.py Thu Dec 12 15:10:44 2019 -0800 +++ b/mercurial/commands.py Thu Dec 12 15:48:48 2019 -0800 @@ -2610,8 +2610,7 @@ bookmark = opts.get(b'bookmark') changesets += tuple(opts.get(b'rev', [])) - if bookmark and changesets: - raise error.Abort(_(b"-r and -B are mutually exclusive")) + cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark') if bookmark: if bookmark not in repo._bookmarks: