Mercurial > evolve
comparison tests/test-evolve-continue.t @ 3796:ededd22e7c7b
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
The help list various flags which you can use during interrupted evolve
resolution and description about what they do. This will be very helpful for
user on how to continue an interrupted evolve.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 06 Jun 2018 04:09:49 +0530 |
| parents | f6979d64b9fb |
| children | f67ac33c07d2 |
comparison
equal
deleted
inserted
replaced
| 3795:b8b4ff86feb8 | 3796:ededd22e7c7b |
|---|---|
| 57 move:[4] added d | 57 move:[4] added d |
| 58 atop:[5] added c | 58 atop:[5] added c |
| 59 merging d | 59 merging d |
| 60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 60 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 61 evolve failed! | 61 evolve failed! |
| 62 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort | 62 see `hg help evolve.interrupted-evolve` |
| 63 abort: unresolved merge conflicts (see hg help resolve) | 63 abort: unresolved merge conflicts (see hg help resolve) |
| 64 [255] | 64 [255] |
| 65 | 65 |
| 66 $ echo foo > d | 66 $ echo foo > d |
| 67 $ hg resolve -m | 67 $ hg resolve -m |
| 116 move:[7] added e | 116 move:[7] added e |
| 117 atop:[8] added d | 117 atop:[8] added d |
| 118 merging e | 118 merging e |
| 119 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | 119 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
| 120 evolve failed! | 120 evolve failed! |
| 121 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort | 121 see `hg help evolve.interrupted-evolve` |
| 122 abort: unresolved merge conflicts (see hg help resolve) | 122 abort: unresolved merge conflicts (see hg help resolve) |
| 123 [255] | 123 [255] |
| 124 | 124 |
| 125 $ echo bar > e | 125 $ echo bar > e |
| 126 $ hg resolve -m | 126 $ hg resolve -m |
| 157 move:[2] added b | 157 move:[2] added b |
| 158 atop:[9] added a | 158 atop:[9] added a |
| 159 merging b | 159 merging b |
| 160 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') | 160 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
| 161 evolve failed! | 161 evolve failed! |
| 162 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort | 162 see `hg help evolve.interrupted-evolve` |
| 163 abort: unresolved merge conflicts (see hg help resolve) | 163 abort: unresolved merge conflicts (see hg help resolve) |
| 164 [255] | 164 [255] |
| 165 | 165 |
| 166 $ echo foo > b | 166 $ echo foo > b |
| 167 $ hg resolve -m | 167 $ hg resolve -m |
| 245 move:[13] added f | 245 move:[13] added f |
| 246 atop:[17] added d | 246 atop:[17] added d |
| 247 merging f | 247 merging f |
| 248 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') | 248 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
| 249 evolve failed! | 249 evolve failed! |
| 250 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort | 250 see `hg help evolve.interrupted-evolve` |
| 251 abort: unresolved merge conflicts (see hg help resolve) | 251 abort: unresolved merge conflicts (see hg help resolve) |
| 252 [255] | 252 [255] |
| 253 | 253 |
| 254 $ echo foo > f | 254 $ echo foo > f |
| 255 $ hg resolve -m | 255 $ hg resolve -m |
| 262 move:[15] added h | 262 move:[15] added h |
| 263 atop:[19] added g | 263 atop:[19] added g |
| 264 merging h | 264 merging h |
| 265 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') | 265 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
| 266 evolve failed! | 266 evolve failed! |
| 267 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort | 267 see `hg help evolve.interrupted-evolve` |
| 268 abort: unresolved merge conflicts (see hg help resolve) | 268 abort: unresolved merge conflicts (see hg help resolve) |
| 269 [255] | 269 [255] |
| 270 | 270 |
| 271 $ echo foo > h | 271 $ echo foo > h |
| 272 $ hg resolve -m | 272 $ hg resolve -m |
| 310 atop:[21] added f | 310 atop:[21] added f |
| 311 perform evolve? [Ny] y | 311 perform evolve? [Ny] y |
| 312 merging g | 312 merging g |
| 313 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') | 313 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
| 314 evolve failed! | 314 evolve failed! |
| 315 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort | 315 see `hg help evolve.interrupted-evolve` |
| 316 abort: unresolved merge conflicts (see hg help resolve) | 316 abort: unresolved merge conflicts (see hg help resolve) |
| 317 [255] | 317 [255] |
| 318 | 318 |
| 319 $ echo foo > g | 319 $ echo foo > g |
| 320 $ hg resolve -m | 320 $ hg resolve -m |
| 362 move:[22] added g | 362 move:[22] added g |
| 363 atop:[24] added f | 363 atop:[24] added f |
| 364 merging g | 364 merging g |
| 365 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') | 365 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
| 366 evolve failed! | 366 evolve failed! |
| 367 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort | 367 see `hg help evolve.interrupted-evolve` |
| 368 abort: unresolved merge conflicts (see hg help resolve) | 368 abort: unresolved merge conflicts (see hg help resolve) |
| 369 [255] | 369 [255] |
| 370 $ echo foo > g | 370 $ echo foo > g |
| 371 $ hg resolve -m | 371 $ hg resolve -m |
| 372 (no more unresolved files) | 372 (no more unresolved files) |