Mercurial > evolve
comparison tests/test-evolve-stop.t @ 3702:f6979d64b9fb
evolve: point to '--abort' in error message
The way to escape and evolve run has been updated and we need to tell our user
about it.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sun, 22 Apr 2018 11:40:17 +0200 |
| parents | 279d8b610ac5 |
| children | 19ec729f3ca2 |
comparison
equal
deleted
inserted
replaced
| 3701:29c413a7dfb5 | 3702:f6979d64b9fb |
|---|---|
| 87 move:[4] added d | 87 move:[4] added d |
| 88 atop:[5] added c | 88 atop:[5] added c |
| 89 merging d | 89 merging d |
| 90 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 90 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 91 evolve failed! | 91 evolve failed! |
| 92 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort | 92 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
| 93 abort: unresolved merge conflicts (see hg help resolve) | 93 abort: unresolved merge conflicts (see hg help resolve) |
| 94 [255] | 94 [255] |
| 95 | 95 |
| 96 $ hg evolve --stop | 96 $ hg evolve --stop |
| 97 stopped the interrupted evolve | 97 stopped the interrupted evolve |
| 135 move:[4] added d | 135 move:[4] added d |
| 136 atop:[5] added c | 136 atop:[5] added c |
| 137 merging d | 137 merging d |
| 138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 138 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 139 evolve failed! | 139 evolve failed! |
| 140 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort | 140 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
| 141 abort: unresolved merge conflicts (see hg help resolve) | 141 abort: unresolved merge conflicts (see hg help resolve) |
| 142 [255] | 142 [255] |
| 143 | 143 |
| 144 $ hg diff | 144 $ hg diff |
| 145 diff -r cb6a2ab625bb d | 145 diff -r cb6a2ab625bb d |
| 184 move:[4] added d | 184 move:[4] added d |
| 185 atop:[5] added c | 185 atop:[5] added c |
| 186 merging d | 186 merging d |
| 187 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 187 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 188 evolve failed! | 188 evolve failed! |
| 189 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort | 189 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
| 190 abort: unresolved merge conflicts (see hg help resolve) | 190 abort: unresolved merge conflicts (see hg help resolve) |
| 191 [255] | 191 [255] |
| 192 $ echo foo > d | 192 $ echo foo > d |
| 193 $ hg resolve -m | 193 $ hg resolve -m |
| 194 (no more unresolved files) | 194 (no more unresolved files) |
| 237 move:[5] added c | 237 move:[5] added c |
| 238 atop:[9] added b | 238 atop:[9] added b |
| 239 merging c | 239 merging c |
| 240 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 240 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 241 evolve failed! | 241 evolve failed! |
| 242 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort | 242 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
| 243 abort: unresolved merge conflicts (see hg help resolve) | 243 abort: unresolved merge conflicts (see hg help resolve) |
| 244 [255] | 244 [255] |
| 245 | 245 |
| 246 $ hg status | 246 $ hg status |
| 247 M c | 247 M c |
| 276 move:[5] added c | 276 move:[5] added c |
| 277 atop:[9] added b | 277 atop:[9] added b |
| 278 merging c | 278 merging c |
| 279 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 279 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 280 evolve failed! | 280 evolve failed! |
| 281 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort | 281 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
| 282 abort: unresolved merge conflicts (see hg help resolve) | 282 abort: unresolved merge conflicts (see hg help resolve) |
| 283 [255] | 283 [255] |
| 284 | 284 |
| 285 $ echo foobar > c | 285 $ echo foobar > c |
| 286 $ hg resolve -m | 286 $ hg resolve -m |
| 354 move:[10] added c | 354 move:[10] added c |
| 355 atop:[13] added b | 355 atop:[13] added b |
| 356 merging c | 356 merging c |
| 357 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') | 357 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
| 358 evolve failed! | 358 evolve failed! |
| 359 fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort | 359 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
| 360 abort: unresolved merge conflicts (see hg help resolve) | 360 abort: unresolved merge conflicts (see hg help resolve) |
| 361 [255] | 361 [255] |
| 362 | 362 |
| 363 $ hg evolve --stop | 363 $ hg evolve --stop |
| 364 stopped the interrupted evolve | 364 stopped the interrupted evolve |