Show More
@@ -760,22 +760,14 b' def _dotransplant(ui, repo, *revs, **opt' | |||
|
760 | 760 | |
|
761 | 761 | def checkopts(opts, revs): |
|
762 | 762 | if opts.get(b'continue'): |
|
763 | if opts.get(b'branch') or opts.get(b'all') or opts.get(b'merge'): | |
|
764 | raise error.Abort( | |
|
765 |
|
|
|
766 | b'--continue is incompatible with ' | |
|
767 | b'--branch, --all and --merge' | |
|
768 | ) | |
|
769 | ) | |
|
763 | cmdutil.check_incompatible_arguments( | |
|
764 | opts, b'continue', b'branch', b'all', b'merge' | |
|
765 | ) | |
|
770 | 766 | return |
|
771 | 767 | if opts.get(b'stop'): |
|
772 | if opts.get(b'branch') or opts.get(b'all') or opts.get(b'merge'): | |
|
773 | raise error.Abort( | |
|
774 |
|
|
|
775 | b'--stop is incompatible with ' | |
|
776 | b'--branch, --all and --merge' | |
|
777 | ) | |
|
778 | ) | |
|
768 | cmdutil.check_incompatible_arguments( | |
|
769 | opts, b'stop', b'branch', b'all', b'merge' | |
|
770 | ) | |
|
779 | 771 | return |
|
780 | 772 | if not ( |
|
781 | 773 | opts.get(b'source') |
@@ -18,10 +18,10 b'' | |||
|
18 | 18 | abort: no source URL, branch revision, or revision list provided |
|
19 | 19 | [255] |
|
20 | 20 | $ hg transplant --continue --all |
|
21 | abort: --continue is incompatible with --branch, --all and --merge | |
|
21 | abort: cannot specify both --continue and --all | |
|
22 | 22 | [255] |
|
23 | 23 | $ hg transplant --stop --all |
|
24 | abort: --stop is incompatible with --branch, --all and --merge | |
|
24 | abort: cannot specify both --stop and --all | |
|
25 | 25 | [255] |
|
26 | 26 | $ hg transplant --all tip |
|
27 | 27 | abort: --all requires a branch revision |
General Comments 0
You need to be logged in to leave comments.
Login now