Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: make one missed error to align other error messages
authorPulkit Goyal <7895pulkit@gmail.com>
Fri, 15 Jun 2018 00:50:17 +0530
changeset 3853 796334340cad
parent 3852 629558d09898
child 3854 b1eb2dea6737
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.
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions
tests/test-evolve-abort-contentdiv.t file | annotate | diff | comparison | revisions
tests/test-evolve-content-divergence.t file | annotate | diff | comparison | revisions
tests/test-evolve-stop-contentdiv.t file | annotate | diff | comparison | revisions 
--- 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
evolve