Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 43927:905b21783968
rebase: use cmdutil.check_incompatible_arguments() for action+confirm/dryrun
Differential Revision: https://phab.mercurial-scm.org/D7661
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 13 Dec 2019 14:50:42 -0800 |
parents | b56c6647f65e |
children | ab33782deb84 |
comparison
equal
deleted
inserted
replaced
43926:daed70e95d60 | 43927:905b21783968 |
---|---|
330 o 0:cb9a9f314b8b test | 330 o 0:cb9a9f314b8b test |
331 a | 331 a |
332 | 332 |
333 Make sure it throws error while passing --continue or --abort with --dry-run | 333 Make sure it throws error while passing --continue or --abort with --dry-run |
334 $ hg rebase -s 2 -d 6 -n --continue | 334 $ hg rebase -s 2 -d 6 -n --continue |
335 abort: cannot specify both --dry-run and --continue | 335 abort: cannot specify both --continue and --dry-run |
336 [255] | 336 [255] |
337 $ hg rebase -s 2 -d 6 -n --abort | 337 $ hg rebase -s 2 -d 6 -n --abort |
338 abort: cannot specify both --dry-run and --abort | 338 abort: cannot specify both --abort and --dry-run |
339 [255] | 339 [255] |
340 | 340 |
341 Check dryrun gives correct results when there is no conflict in rebasing | 341 Check dryrun gives correct results when there is no conflict in rebasing |
342 $ hg rebase -s 2 -d 6 -n | 342 $ hg rebase -s 2 -d 6 -n |
343 starting dry-run rebase; repository will not be changed | 343 starting dry-run rebase; repository will not be changed |
546 Check it gives error when both --dryrun and --confirm is used: | 546 Check it gives error when both --dryrun and --confirm is used: |
547 $ hg rebase -s 2 -d . --confirm --dry-run | 547 $ hg rebase -s 2 -d . --confirm --dry-run |
548 abort: cannot specify both --confirm and --dry-run | 548 abort: cannot specify both --confirm and --dry-run |
549 [255] | 549 [255] |
550 $ hg rebase -s 2 -d . --confirm --abort | 550 $ hg rebase -s 2 -d . --confirm --abort |
551 abort: cannot specify both --confirm and --abort | 551 abort: cannot specify both --abort and --confirm |
552 [255] | 552 [255] |
553 $ hg rebase -s 2 -d . --confirm --continue | 553 $ hg rebase -s 2 -d . --confirm --continue |
554 abort: cannot specify both --confirm and --continue | 554 abort: cannot specify both --continue and --confirm |
555 [255] | 555 [255] |
556 | 556 |
557 Test --confirm option when there are no conflicts: | 557 Test --confirm option when there are no conflicts: |
558 $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF | 558 $ hg rebase -s 2 -d . --keep --config ui.interactive=True --confirm << EOF |
559 > n | 559 > n |