Mercurial > evolve
changeset 3853:796334340cad
evolve: make one missed error to align other error messages
Previous patches missed this error to change it to the new format. Let's align
this with all other messages raised by `hg evolve` command.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 15 Jun 2018 00:50:17 +0530 |
| parents | 629558d09898 |
| children | b1eb2dea6737 |
| files | hgext3rd/evolve/evolvecmd.py tests/test-evolve-abort-contentdiv.t tests/test-evolve-content-divergence.t tests/test-evolve-stop-contentdiv.t |
| diffstat | 4 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Fri Jun 15 00:16:29 2018 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Fri Jun 15 00:50:17 2018 +0530 @@ -479,7 +479,8 @@ except MergeFailure: evolvestate['current'] = other.node() evolvestate.save() - raise + raise error.InterventionRequired(_("fix conflicts and see `hg help " + "evolve.interrupted`")) evolvestate['old-other'] = other.node() other = repo[newother] evolvestate['relocating'] = False
--- a/tests/test-evolve-abort-contentdiv.t Fri Jun 15 00:16:29 2018 +0530 +++ b/tests/test-evolve-abort-contentdiv.t Fri Jun 15 00:50:17 2018 +0530 @@ -283,8 +283,8 @@ rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - abort: unresolved merge conflicts (see hg help resolve) - [255] + fix conflicts and see `hg help evolve.interrupted` + [1] $ hg evolve --abort evolve aborted
--- a/tests/test-evolve-content-divergence.t Fri Jun 15 00:16:29 2018 +0530 +++ b/tests/test-evolve-content-divergence.t Fri Jun 15 00:50:17 2018 +0530 @@ -668,8 +668,8 @@ rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf merging y warning: conflicts while merging y! (edit, then use 'hg resolve --mark') - abort: unresolved merge conflicts (see hg help resolve) - [255] + fix conflicts and see `hg help evolve.interrupted` + [1] $ hg diff diff -r 7bbcf24ddecf y
--- a/tests/test-evolve-stop-contentdiv.t Fri Jun 15 00:16:29 2018 +0530 +++ b/tests/test-evolve-stop-contentdiv.t Fri Jun 15 00:50:17 2018 +0530 @@ -178,8 +178,8 @@ rebasing "other" content-divergent changeset 8fd1c4bd144c on ca1b80f7960a merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - abort: unresolved merge conflicts (see hg help resolve) - [255] + fix conflicts and see `hg help evolve.interrupted` + [1] $ hg diff diff -r ca1b80f7960a c