Mercurial > evolve
comparison tests/test-evolve-abort-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 | f9dad99a90d5 |
| children | 796334340cad |
comparison
equal
deleted
inserted
replaced
| 3851:9ebed1e95ef7 | 3852:629558d09898 |
|---|---|
| 76 base: [4] added d | 76 base: [4] added d |
| 77 merging "other" content-divergent changeset 'e49523854bc8' | 77 merging "other" content-divergent changeset 'e49523854bc8' |
| 78 merging d | 78 merging d |
| 79 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 79 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 80 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 80 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 81 abort: fix conflicts and see `hg help evolve.interrupted` | 81 fix conflicts and see `hg help evolve.interrupted` |
| 82 [255] | 82 [1] |
| 83 | 83 |
| 84 $ hg status -v | 84 $ hg status -v |
| 85 M d | 85 M d |
| 86 # The repository is in an unfinished *evolve* state. | 86 # The repository is in an unfinished *evolve* state. |
| 87 | 87 |
| 175 updating to "local" side of the conflict: e49523854bc8 | 175 updating to "local" side of the conflict: e49523854bc8 |
| 176 merging "other" content-divergent changeset 'f0f1694f123e' | 176 merging "other" content-divergent changeset 'f0f1694f123e' |
| 177 merging d | 177 merging d |
| 178 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 178 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 179 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 179 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 180 abort: fix conflicts and see `hg help evolve.interrupted` | 180 fix conflicts and see `hg help evolve.interrupted` |
| 181 [255] | 181 [1] |
| 182 | 182 |
| 183 $ hg evolve --abort | 183 $ hg evolve --abort |
| 184 2 new content-divergent changesets | 184 2 new content-divergent changesets |
| 185 evolve aborted | 185 evolve aborted |
| 186 working directory is now at 491e10505bae | 186 working directory is now at 491e10505bae |
| 336 updating to "local" side of the conflict: e49523854bc8 | 336 updating to "local" side of the conflict: e49523854bc8 |
| 337 merging "other" content-divergent changeset 'a663d1567f0b' | 337 merging "other" content-divergent changeset 'a663d1567f0b' |
| 338 merging d | 338 merging d |
| 339 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 339 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 340 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 340 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 341 abort: fix conflicts and see `hg help evolve.interrupted` | 341 fix conflicts and see `hg help evolve.interrupted` |
| 342 [255] | 342 [1] |
| 343 | 343 |
| 344 $ hg evolve --abort | 344 $ hg evolve --abort |
| 345 evolve aborted | 345 evolve aborted |
| 346 working directory is now at 33e4442acf98 | 346 working directory is now at 33e4442acf98 |
| 347 | 347 |