Mercurial > evolve
comparison tests/test-evolve.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 | 5a796d753427 |
| children | 19ec729f3ca2 1e103c7f7663 |
comparison
equal
deleted
inserted
replaced
| 3701:29c413a7dfb5 | 3702:f6979d64b9fb |
|---|---|
| 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 update -C .' to abort | 1539 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
| 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 |