evolve: remove duplicated documentation
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 06 Jun 2018 14:35:36 +0200
changeset 3797 9d63d124fd23
parent 3796 ededd22e7c7b
child 3798 7c05ee4a8cc7
evolve: remove duplicated documentation File saving failureā€¦
hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py	Wed Jun 06 04:09:49 2018 +0530
+++ b/hgext3rd/evolve/__init__.py	Wed Jun 06 14:35:36 2018 +0200
@@ -182,28 +182,6 @@
         successor
       - "successors" a sorted list of locally know successors node ids
       - "markers" the raw list of changesets.
-
-Interrupted-Evolve
-==================
-
-The `hg evolve` command is an all purpose tool that solve all kind of
-instabilities in your repository. Sometimes, instability resolution will lead
-to merge conflict that cannot be solved without a human intervention (same as
-`hg merge`). This can lead to an "interrupted state" where human assistance is
-requested. There are three things which you can do when you face a similar
-situation:
-
-  - `hg evolve --continue`:
-     fix all the conflicts using `hg resolve` and then run this to continue the
-     interrupted evolve
-
-  - `hg evolve --stop`:
-     stops the current interrupted evolve,. keeping all the successful steps,
-     but delaying to resolution of the remaining step for later.
-
-  - `hg evolve --abort`:
-     aborts the interrupted evolve and undoes all the resolution which have
-     happened
 """
 
 evolutionhelptext = """