Mercurial > evolve
comparison tests/test-stabilize-result.t @ 3852:629558d09898
evolve: raise error.InterventionRequired instead of Abort when conflicts
error.InterventionRequired is a better error to raise in such cases.
Thanks to marmoute for noticing this.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 15 Jun 2018 00:16:29 +0530 |
| parents | f9dad99a90d5 |
| children | f7afd3a158e3 25981fae92f9 |
comparison
equal
deleted
inserted
replaced
| 3851:9ebed1e95ef7 | 3852:629558d09898 |
|---|---|
| 79 $ hg evolve | 79 $ hg evolve |
| 80 move:[4] newer a | 80 move:[4] newer a |
| 81 atop:[5] changea | 81 atop:[5] changea |
| 82 merging a | 82 merging a |
| 83 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 83 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 84 abort: fix conflicts and see `hg help evolve.interrupted` | 84 fix conflicts and see `hg help evolve.interrupted` |
| 85 [255] | 85 [1] |
| 86 $ hg revert -r "orphan()" a | 86 $ hg revert -r "orphan()" a |
| 87 $ hg diff | 87 $ hg diff |
| 88 diff -r 66719795a494 a | 88 diff -r 66719795a494 a |
| 89 --- a/a Thu Jan 01 00:00:00 1970 +0000 | 89 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
| 90 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | 90 +++ b/a Thu Jan 01 00:00:00 1970 +0000 |
| 388 base: [12] More addition | 388 base: [12] More addition |
| 389 merging "other" content-divergent changeset '4d6ed26797bc' | 389 merging "other" content-divergent changeset '4d6ed26797bc' |
| 390 merging a | 390 merging a |
| 391 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 391 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 392 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 392 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 393 abort: fix conflicts and see `hg help evolve.interrupted` | 393 fix conflicts and see `hg help evolve.interrupted` |
| 394 [255] | 394 [1] |
| 395 | 395 |
| 396 $ cat > a <<EOF | 396 $ cat > a <<EOF |
| 397 > jungle | 397 > jungle |
| 398 > a | 398 > a |
| 399 > flore | 399 > flore |