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: point to `hg help evolve.interrupted` while resolving content-div
authorPulkit Goyal <7895pulkit@gmail.com>
Tue, 12 Jun 2018 04:01:19 +0530
changeset 3842 b293cce4ff55
parent 3841 82b79a8dafd9
child 3843 f0096db2a7b1
evolve: point to `hg help evolve.interrupted` while resolving content-div Recent test additions shows that --abort and --stop works well while resolving content-divergence and we should advertise them. This patch does so by pointing to evolve.interrupted help topic.
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
tests/test-stabilize-result.t file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/evolvecmd.py	Tue Jun 12 03:29:13 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Tue Jun 12 04:01:19 2018 +0530
@@ -503,8 +503,8 @@
         tr = repo.currenttransaction()
         tr.close()
         evolvestate.save()
-        raise error.Abort(_("fix conflicts and run 'hg evolve --continue' or"
-                            " use 'hg update -C .' to abort"))
+        raise error.Abort(_("fix conflicts and see `hg help "
+                            "evolve.interrupted`"))
 
 def _completecontentdivergent(ui, repo, progresscb, divergent, other,
                               base, evolvestate):
--- a/tests/test-evolve-abort-contentdiv.t	Tue Jun 12 03:29:13 2018 +0530
+++ b/tests/test-evolve-abort-contentdiv.t	Tue Jun 12 04:01:19 2018 +0530
@@ -78,7 +78,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg status -v
@@ -178,7 +178,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg evolve --abort
@@ -338,7 +338,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg evolve --abort
--- a/tests/test-evolve-content-divergence.t	Tue Jun 12 03:29:13 2018 +0530
+++ b/tests/test-evolve-content-divergence.t	Tue Jun 12 04:01:19 2018 +0530
@@ -175,7 +175,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ echo foobar > d
@@ -235,7 +235,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ echo watbar > d
@@ -532,7 +532,7 @@
   merging y
   warning: conflicts while merging y! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ echo watbar > y
--- a/tests/test-evolve-stop-contentdiv.t	Tue Jun 12 03:29:13 2018 +0530
+++ b/tests/test-evolve-stop-contentdiv.t	Tue Jun 12 04:01:19 2018 +0530
@@ -75,7 +75,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg evolve --stop
@@ -129,7 +129,7 @@
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ hg evolve --stop
--- a/tests/test-stabilize-result.t	Tue Jun 12 03:29:13 2018 +0530
+++ b/tests/test-stabilize-result.t	Tue Jun 12 04:01:19 2018 +0530
@@ -394,7 +394,7 @@
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-  abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
+  abort: fix conflicts and see `hg help evolve.interrupted`
   [255]
 
   $ cat > a <<EOF
evolve