Mercurial > evolve

changeset 3821:f67ac33c07d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted `evolve.interrupted-evolve` has the word evolve twice. Now that this help topic is a part of evolve command, evolve.interrupted will mean the interrupted evolve command only.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 11 Jun 2018 01:12:12 +0530
parents 3273b178c202
children cb060c408b41
files hgext3rd/evolve/evolvecmd.py tests/test-evolve-abort-orphan.t tests/test-evolve-continue.t tests/test-evolve-orphan-merge.t tests/test-evolve-phase.t tests/test-evolve-stop-orphan.t tests/test-evolve.t tests/test-issue-5720.t tests/test-stabilize-conflict.t tests/test-stabilize-result.t
diffstat 10 files changed, 32 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py	Thu Jun 07 22:59:39 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Jun 11 01:12:12 2018 +0530
@@ -50,7 +50,7 @@
 eh = exthelper.exthelper()
 mergetoolopts = commands.mergetoolopts
 
-abortmessage = _("see `hg help evolve.interrupted-evolve`\n")
+abortmessage = _("see `hg help evolve.interrupted`\n")
 
 def _solveone(ui, repo, ctx, evolvestate, dryrun, confirm,
               progresscb, category):
@@ -1301,8 +1301,8 @@
     repository by using the --list flag. You can choose to display only some
     categories of troubles with the --unstable, --divergent or --bumped flags.
 
-    Interrupted-Evolve
-    ==================
+    Interrupted
+    ===========
 
     The `hg evolve` command is an all purpose tool that solve all kind of
     instabilities in your repository. Sometimes, instability resolution will lead
--- a/tests/test-evolve-abort-orphan.t	Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-evolve-abort-orphan.t	Mon Jun 11 01:12:12 2018 +0530
@@ -86,7 +86,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -120,7 +120,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ echo foo > d
@@ -150,7 +150,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -245,7 +245,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -311,7 +311,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg glog
@@ -390,7 +390,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -468,7 +468,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -516,7 +516,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
--- a/tests/test-evolve-continue.t	Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-evolve-continue.t	Mon Jun 11 01:12:12 2018 +0530
@@ -59,7 +59,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   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!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   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!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   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!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   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!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   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!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   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!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ echo foo > g
--- a/tests/test-evolve-orphan-merge.t	Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-evolve-orphan-merge.t	Mon Jun 11 01:12:12 2018 +0530
@@ -220,7 +220,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   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!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
--- a/tests/test-evolve-phase.t	Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-evolve-phase.t	Mon Jun 11 01:12:12 2018 +0530
@@ -87,7 +87,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
--- a/tests/test-evolve-stop-orphan.t	Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-evolve-stop-orphan.t	Mon Jun 11 01:12:12 2018 +0530
@@ -91,7 +91,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -139,7 +139,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -188,7 +188,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ echo foo > d
@@ -241,7 +241,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -280,7 +280,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
@@ -358,7 +358,7 @@
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
--- a/tests/test-evolve.t	Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-evolve.t	Mon Jun 11 01:12:12 2018 +0530
@@ -1536,7 +1536,7 @@
   merging newfile
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
--- a/tests/test-issue-5720.t	Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-issue-5720.t	Mon Jun 11 01:12:12 2018 +0530
@@ -62,7 +62,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
 
--- a/tests/test-stabilize-conflict.t	Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-stabilize-conflict.t	Mon Jun 11 01:12:12 2018 +0530
@@ -129,7 +129,7 @@
   merging babar
   warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   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!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg resolve -l
--- a/tests/test-stabilize-result.t	Thu Jun 07 22:59:39 2018 +0530
+++ b/tests/test-stabilize-result.t	Mon Jun 11 01:12:12 2018 +0530
@@ -82,7 +82,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   evolve failed!
-  see `hg help evolve.interrupted-evolve`
+  see `hg help evolve.interrupted`
   abort: unresolved merge conflicts (see hg help resolve)
   [255]
   $ hg revert -r "orphan()" a