##// END OF EJS Templates
backout: leverage cmdutil.check_incompatible_arguments()...
Martin von Zweigbergk -
r46331:693da1b9 default
parent child Browse files
Show More
@@ -769,11 +769,8 b' def backout(ui, repo, node=None, rev=Non'
769
769
770
770
771 def _dobackout(ui, repo, node=None, rev=None, **opts):
771 def _dobackout(ui, repo, node=None, rev=None, **opts):
772 cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
772 opts = pycompat.byteskwargs(opts)
773 opts = pycompat.byteskwargs(opts)
773 if opts.get(b'commit') and opts.get(b'no_commit'):
774 raise error.Abort(_(b"cannot use --commit with --no-commit"))
775 if opts.get(b'merge') and opts.get(b'no_commit'):
776 raise error.Abort(_(b"cannot use --merge with --no-commit"))
777
774
778 if rev and node:
775 if rev and node:
779 raise error.Abort(_(b"please specify just one revision"))
776 raise error.Abort(_(b"please specify just one revision"))
@@ -804,5 +804,5 b' Test usage of `hg resolve` in case of co'
804 --no-commit can't be used with --merge
804 --no-commit can't be used with --merge
805
805
806 $ hg backout --merge --no-commit 2
806 $ hg backout --merge --no-commit 2
807 abort: cannot use --merge with --no-commit
807 abort: cannot specify both --no-commit and --merge
808 [255]
808 [255]
General Comments 0
You need to be logged in to leave comments. Login now