Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 45840:527ce85c2e60
errors: introduce StateError and use it from commands and cmdutil
This very similar to an earlier patch (which was for `InputError`).
In this patch, I also updated the transplant extension only because
`test-transplant.t` would otherwise have needed a `#if continueflag`.
Differential Revision: https://phab.mercurial-scm.org/D9310
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 12 Oct 2020 12:44:18 -0700 |
| parents | 8d72e29ad1e0 |
| children | d767f71b9158 |
comparison
equal
deleted
inserted
replaced
| 45839:ebee234d952a | 45840:527ce85c2e60 |
|---|---|
| 482 merging e | 482 merging e |
| 483 hit merge conflicts; rebasing that commit again in the working copy | 483 hit merge conflicts; rebasing that commit again in the working copy |
| 484 transaction abort! | 484 transaction abort! |
| 485 rollback completed | 485 rollback completed |
| 486 abort: uncommitted changes | 486 abort: uncommitted changes |
| 487 [255] | 487 [20] |
| 488 $ cat a | 488 $ cat a |
| 489 dirty | 489 dirty |
| 490 | 490 |
| 491 Retrying without in-memory merge won't lose merge state | 491 Retrying without in-memory merge won't lose merge state |
| 492 $ cd .. | 492 $ cd .. |
| 501 $ hg resolve -l | 501 $ hg resolve -l |
| 502 U e | 502 U e |
| 503 $ hg rebase -s 2 -d 7 | 503 $ hg rebase -s 2 -d 7 |
| 504 abort: outstanding uncommitted merge | 504 abort: outstanding uncommitted merge |
| 505 (use 'hg commit' or 'hg merge --abort') | 505 (use 'hg commit' or 'hg merge --abort') |
| 506 [255] | 506 [20] |
| 507 $ hg resolve -l | 507 $ hg resolve -l |
| 508 U e | 508 U e |
| 509 | 509 |
| 510 ========================== | 510 ========================== |
| 511 Test for --confirm option| | 511 Test for --confirm option| |
| 891 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') | 891 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
| 892 [240] | 892 [240] |
| 893 $ hg rebase -r 3 -d 1 -t:merge3 | 893 $ hg rebase -r 3 -d 1 -t:merge3 |
| 894 abort: rebase in progress | 894 abort: rebase in progress |
| 895 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') | 895 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
| 896 [255] | 896 [20] |
| 897 $ hg resolve --list | 897 $ hg resolve --list |
| 898 U foo | 898 U foo |
| 899 $ hg resolve --all --re-merge -t:other | 899 $ hg resolve --all --re-merge -t:other |
| 900 (no more unresolved files) | 900 (no more unresolved files) |
| 901 continue: hg rebase --continue | 901 continue: hg rebase --continue |