Submitter | phabricator |
---|---|
Date | Oct. 16, 2020, 6:03 a.m. |
Message ID | <differential-rev-PHID-DREV-im324sz5kwnimhjf2vbg-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47482/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -7087,6 +7087,7 @@ Returns 0 on success. """ + cmdutil.check_incompatible_arguments(opts, 'remove', ['rev']) opts = pycompat.byteskwargs(opts) with repo.wlock(), repo.lock(): rev_ = b"." @@ -7099,8 +7100,6 @@ raise error.Abort( _(b'tag names cannot consist entirely of whitespace') ) - if opts.get(b'rev') and opts.get(b'remove'): - raise error.Abort(_(b"--rev and --remove are incompatible")) if opts.get(b'rev'): rev_ = opts[b'rev'] message = opts.get(b'message')