Show More
@@ -1024,6 +1024,9 b' def rebase(ui, repo, **opts):' | |||
|
1024 | 1024 | cmdutil.check_incompatible_arguments( |
|
1025 | 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 | 1030 | cmdutil.check_at_most_one_arg(opts, b'confirm', b'dry_run') |
|
1028 | 1031 | cmdutil.check_at_most_one_arg(opts, b'rev', b'source', b'base') |
|
1029 | 1032 | |
@@ -1192,10 +1195,6 b' def _origrebase(' | |||
|
1192 | 1195 | raise error.Abort( |
|
1193 | 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 | 1198 | if action == b'abort' and opts.get(b'tool', False): |
|
1200 | 1199 | ui.warn(_(b'tool option will be ignored\n')) |
|
1201 | 1200 | if action == b'continue': |
General Comments 0
You need to be logged in to leave comments.
Login now