Mercurial > evolve
comparison tests/test-evolve-stop-contentdiv.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 | b293cce4ff55 |
| children | 796334340cad |
comparison
equal
deleted
inserted
replaced
| 3851:9ebed1e95ef7 | 3852:629558d09898 |
|---|---|
| 73 base: [4] added d | 73 base: [4] added d |
| 74 merging "other" content-divergent changeset 'e49523854bc8' | 74 merging "other" content-divergent changeset 'e49523854bc8' |
| 75 merging d | 75 merging d |
| 76 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 76 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 77 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 78 abort: fix conflicts and see `hg help evolve.interrupted` | 78 fix conflicts and see `hg help evolve.interrupted` |
| 79 [255] | 79 [1] |
| 80 | 80 |
| 81 $ hg evolve --stop | 81 $ hg evolve --stop |
| 82 stopped the interrupted evolve | 82 stopped the interrupted evolve |
| 83 working directory is now at 9c1631e352d9 | 83 working directory is now at 9c1631e352d9 |
| 84 | 84 |
| 127 updating to "local" side of the conflict: e49523854bc8 | 127 updating to "local" side of the conflict: e49523854bc8 |
| 128 merging "other" content-divergent changeset '606ad96040fc' | 128 merging "other" content-divergent changeset '606ad96040fc' |
| 129 merging d | 129 merging d |
| 130 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 130 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 131 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 131 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 132 abort: fix conflicts and see `hg help evolve.interrupted` | 132 fix conflicts and see `hg help evolve.interrupted` |
| 133 [255] | 133 [1] |
| 134 | 134 |
| 135 $ hg evolve --stop | 135 $ hg evolve --stop |
| 136 stopped the interrupted evolve | 136 stopped the interrupted evolve |
| 137 working directory is now at 517d4375cb72 | 137 working directory is now at 517d4375cb72 |
| 138 | 138 |