# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1524390017 -7200
# Node ID f6979d64b9fb42d3736cbc6a72b6d581b9af895d
# Parent  29c413a7dfb542e80aa0a8900718a3aa62d5aa04
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.

diff -r 29c413a7dfb5 -r f6979d64b9fb hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Thu Apr 19 16:27:13 2018 +0200
+++ b/hgext3rd/evolve/evolvecmd.py	Sun Apr 22 11:40:17 2018 +0200
@@ -180,7 +180,7 @@
             repo.ui.write_err(_('evolve failed!\n'))
             repo.ui.write_err(
                 _("fix conflict and run 'hg evolve --continue'"
-                  " or use 'hg update -C .' to abort\n"))
+                  " or use 'hg evolve --abort' to abort\n"))
             raise
 
 def _solvephasedivergence(ui, repo, bumped, evolvestate, dryrun=False,
@@ -250,7 +250,8 @@
             evolvestate['precursor'] = prec.hex()
             evolvestate.save()
             repo.ui.write_err(_('evolution failed!\n'))
-            msg = _("fix conflict and run 'hg evolve --continue'\n")
+            msg = _("fix conflict then run 'hg evolve --continue' or "
+                    "use `hg evolve --abort`\n")
             repo.ui.write_err(msg)
             raise
 
diff -r 29c413a7dfb5 -r f6979d64b9fb tests/test-evolve-abort.t
--- 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]
 
diff -r 29c413a7dfb5 -r f6979d64b9fb tests/test-evolve-continue.t
--- a/tests/test-evolve-continue.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-evolve-continue.t	Sun Apr 22 11:40:17 2018 +0200
@@ -59,7 +59,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]
 
@@ -118,7 +118,7 @@
   merging e
   warning: conflicts while merging e! (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]
 
@@ -159,7 +159,7 @@
   merging b
   warning: conflicts while merging b! (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]
 
@@ -247,7 +247,7 @@
   merging f
   warning: conflicts while merging f! (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]
 
@@ -264,7 +264,7 @@
   merging h
   warning: conflicts while merging h! (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]
 
@@ -312,7 +312,7 @@
   merging g
   warning: conflicts while merging g! (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]
 
@@ -364,7 +364,7 @@
   merging g
   warning: conflicts while merging g! (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 > g
diff -r 29c413a7dfb5 -r f6979d64b9fb tests/test-evolve-orphan-merge.t
--- a/tests/test-evolve-orphan-merge.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-evolve-orphan-merge.t	Sun Apr 22 11:40:17 2018 +0200
@@ -220,7 +220,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]
 
@@ -277,7 +277,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]
 
diff -r 29c413a7dfb5 -r f6979d64b9fb tests/test-evolve-phase-divergence.t
--- a/tests/test-evolve-phase-divergence.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-evolve-phase-divergence.t	Sun Apr 22 11:40:17 2018 +0200
@@ -788,7 +788,7 @@
   merging x
   warning: conflicts while merging x! (edit, then use 'hg resolve --mark')
   evolution failed!
-  fix conflict and run 'hg evolve --continue'
+  fix conflict then run 'hg evolve --continue' or use `hg evolve --abort`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
diff -r 29c413a7dfb5 -r f6979d64b9fb tests/test-evolve-phase.t
--- a/tests/test-evolve-phase.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-evolve-phase.t	Sun Apr 22 11:40:17 2018 +0200
@@ -87,7 +87,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]
 
diff -r 29c413a7dfb5 -r f6979d64b9fb tests/test-evolve-stop.t
--- a/tests/test-evolve-stop.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-evolve-stop.t	Sun Apr 22 11:40:17 2018 +0200
@@ -89,7 +89,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]
 
@@ -137,7 +137,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]
 
@@ -186,7 +186,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
@@ -239,7 +239,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]
 
@@ -278,7 +278,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]
 
@@ -356,7 +356,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]
 
diff -r 29c413a7dfb5 -r f6979d64b9fb tests/test-evolve.t
--- a/tests/test-evolve.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-evolve.t	Sun Apr 22 11:40:17 2018 +0200
@@ -1536,7 +1536,7 @@
   merging newfile
   warning: conflicts while merging newfile! (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]
 
diff -r 29c413a7dfb5 -r f6979d64b9fb tests/test-issue-5720.t
--- a/tests/test-issue-5720.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-issue-5720.t	Sun Apr 22 11:40:17 2018 +0200
@@ -62,7 +62,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]
 
diff -r 29c413a7dfb5 -r f6979d64b9fb tests/test-stabilize-conflict.t
--- a/tests/test-stabilize-conflict.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-stabilize-conflict.t	Sun Apr 22 11:40:17 2018 +0200
@@ -129,7 +129,7 @@
   merging babar
   warning: conflicts while merging babar! (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 resolve -l
@@ -223,7 +223,7 @@
   was merge successful (yn)? n
   merging babar failed!
   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 resolve -l
diff -r 29c413a7dfb5 -r f6979d64b9fb tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t	Thu Apr 19 16:27:13 2018 +0200
+++ b/tests/test-stabilize-result.t	Sun Apr 22 11:40:17 2018 +0200
@@ -82,7 +82,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 revert -r "orphan()" a