Show More
@@ -598,6 +598,8 b' def backout(ui, repo, node=None, rev=Non' | |||
|
598 | 598 | def _dobackout(ui, repo, node=None, rev=None, **opts): |
|
599 | 599 | if opts.get('commit') and opts.get('no_commit'): |
|
600 | 600 | raise error.Abort(_("cannot use --commit with --no-commit")) |
|
601 | if opts.get('merge') and opts.get('no_commit'): | |
|
602 | raise error.Abort(_("cannot use --merge with --no-commit")) | |
|
601 | 603 | |
|
602 | 604 | if rev and node: |
|
603 | 605 | raise error.Abort(_("please specify just one revision")) |
@@ -753,3 +753,10 b' Test usage of `hg resolve` in case of co' | |||
|
753 | 753 | $ hg backout --no-commit . |
|
754 | 754 | removing 3 |
|
755 | 755 | changeset cccc23d9d68f backed out, don't forget to commit. |
|
756 | $ hg revert -aq | |
|
757 | ||
|
758 | --no-commit can't be used with --merge | |
|
759 | ||
|
760 | $ hg backout --merge --no-commit 2 | |
|
761 | abort: cannot use --merge with --no-commit | |
|
762 | [255] |
General Comments 0
You need to be logged in to leave comments.
Login now