Mercurial > evolve
diff tests/test-evolve-abort.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 | d9682c41ea2f |
| children | 19ec729f3ca2 fa7b94606024 |
line wrap: on
line diff
--- a/tests/test-evolve-abort.t Thu Apr 19 16:27:13 2018 +0200 +++ b/tests/test-evolve-abort.t Sun Apr 22 11:40:17 2018 +0200 @@ -80,7 +80,7 @@ merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') evolve failed! - fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort + fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort abort: unresolved merge conflicts (see hg help resolve) [255] @@ -114,7 +114,7 @@ merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') evolve failed! - fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort + fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort abort: unresolved merge conflicts (see hg help resolve) [255] $ echo foo > d @@ -144,7 +144,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') evolve failed! - fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort + fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort abort: unresolved merge conflicts (see hg help resolve) [255] @@ -239,7 +239,7 @@ merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') evolve failed! - fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort + fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort abort: unresolved merge conflicts (see hg help resolve) [255] @@ -305,7 +305,7 @@ merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') evolve failed! - fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort + fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort abort: unresolved merge conflicts (see hg help resolve) [255] $ hg glog @@ -384,7 +384,7 @@ merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') evolve failed! - fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort + fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort abort: unresolved merge conflicts (see hg help resolve) [255] @@ -462,7 +462,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') evolve failed! - fix conflict and run 'hg evolve --continue' or use 'hg update -C .' to abort + fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort abort: unresolved merge conflicts (see hg help resolve) [255]