Mercurial > evolve
comparison tests/test-evolve.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 | 1e103c7f7663 |
| children | f67ac33c07d2 |
comparison
equal
deleted
inserted
replaced
| 3795:b8b4ff86feb8 | 3796:ededd22e7c7b |
|---|---|
| 1534 move:[36] will cause conflict at evolve | 1534 move:[36] will cause conflict at evolve |
| 1535 atop:[38] will be evolved safely | 1535 atop:[38] will be evolved safely |
| 1536 merging newfile | 1536 merging newfile |
| 1537 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') | 1537 warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') |
| 1538 evolve failed! | 1538 evolve failed! |
| 1539 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort | 1539 see `hg help evolve.interrupted-evolve` |
| 1540 abort: unresolved merge conflicts (see hg help resolve) | 1540 abort: unresolved merge conflicts (see hg help resolve) |
| 1541 [255] | 1541 [255] |
| 1542 | 1542 |
| 1543 $ glog -r "be23044af550::" --hidden | 1543 $ glog -r "be23044af550::" --hidden |
| 1544 @ 38:61abd81de026@default(draft) will be evolved safely | 1544 @ 38:61abd81de026@default(draft) will be evolved safely |