Show More
@@ -1024,6 +1024,9 b' def rebase(ui, repo, **opts):' | |||||
1024 | cmdutil.check_incompatible_arguments( |
|
1024 | cmdutil.check_incompatible_arguments( | |
1025 | opts, action, b'confirm', b'dry_run' |
|
1025 | opts, action, b'confirm', b'dry_run' | |
1026 | ) |
|
1026 | ) | |
|
1027 | cmdutil.check_incompatible_arguments( | |||
|
1028 | opts, action, b'rev', b'source', b'base', b'dest' | |||
|
1029 | ) | |||
1027 | cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') |
|
1030 | cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') | |
1028 | cmdutil.check_at_most_one_arg(opts, b'rev', b'source', b'base') |
|
1031 | cmdutil.check_at_most_one_arg(opts, b'rev', b'source', b'base') | |
1029 |
|
1032 | |||
@@ -1192,10 +1195,6 b' def _origrebase(' | |||||
1192 | raise error.Abort( |
|
1195 | raise error.Abort( | |
1193 | _(b'cannot use collapse with continue or abort') |
|
1196 | _(b'cannot use collapse with continue or abort') | |
1194 | ) |
|
1197 | ) | |
1195 | if srcf or basef or destf: |
|
|||
1196 | raise error.Abort( |
|
|||
1197 | _(b'abort and continue do not allow specifying revisions') |
|
|||
1198 | ) |
|
|||
1199 | if action == b'abort' and opts.get(b'tool', False): |
|
1198 | if action == b'abort' and opts.get(b'tool', False): | |
1200 | ui.warn(_(b'tool option will be ignored\n')) |
|
1199 | ui.warn(_(b'tool option will be ignored\n')) | |
1201 | if action == b'continue': |
|
1200 | if action == b'continue': |
@@ -69,7 +69,7 b' These fail:' | |||||
69 | [255] |
|
69 | [255] | |
70 |
|
70 | |||
71 | $ hg rebase --continue --dest 4 |
|
71 | $ hg rebase --continue --dest 4 | |
72 | abort: abort and continue do not allow specifying revisions |
|
72 | abort: cannot specify both --continue and --dest | |
73 | [255] |
|
73 | [255] | |
74 |
|
74 | |||
75 | $ hg rebase --base 5 --source 4 |
|
75 | $ hg rebase --base 5 --source 4 |
General Comments 0
You need to be logged in to leave comments.
Login now