Mercurial > evolve
comparison tests/test-issue-5720.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 | f0096db2a7b1 |
| children | d00f0c369bc7 bcd52ce0916d |
comparison
equal
deleted
inserted
replaced
| 3851:9ebed1e95ef7 | 3852:629558d09898 |
|---|---|
| 59 $ hg evolve | 59 $ hg evolve |
| 60 move:[2] c | 60 move:[2] c |
| 61 atop:[3] b | 61 atop:[3] b |
| 62 merging a | 62 merging a |
| 63 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') | 63 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
| 64 abort: fix conflicts and see `hg help evolve.interrupted` | 64 fix conflicts and see `hg help evolve.interrupted` |
| 65 [255] | 65 [1] |
| 66 | 66 |
| 67 Fix the conflict | 67 Fix the conflict |
| 68 $ echo c2 > a | 68 $ echo c2 > a |
| 69 $ hg resolve -m | 69 $ hg resolve -m |
| 70 (no more unresolved files) | 70 (no more unresolved files) |