Mercurial > evolve
changeset 3796:ededd22e7c7b
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
The help list various flags which you can use during interrupted evolve
resolution and description about what they do. This will be very helpful for
user on how to continue an interrupted evolve.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 06 Jun 2018 04:09:49 +0530 |
| parents | b8b4ff86feb8 |
| children | 9d63d124fd23 |
| files | CHANGELOG 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 | 11 files changed, 33 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGELOG Wed May 23 01:11:59 2018 +0530 +++ b/CHANGELOG Wed Jun 06 04:09:49 2018 +0530 @@ -5,6 +5,7 @@ ------------------- * evolve: handle branch changes when solving content divergence, + * evolve: add a help section dedicated to interrupted evolve, 8.0.1 -- in-progress ---------------------
--- a/hgext3rd/evolve/evolvecmd.py Wed May 23 01:11:59 2018 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Wed Jun 06 04:09:49 2018 +0530 @@ -49,6 +49,8 @@ eh = exthelper.exthelper() mergetoolopts = commands.mergetoolopts +abortmessage = _("see `hg help evolve.interrupted-evolve`\n") + def _solveone(ui, repo, ctx, evolvestate, dryrun, confirm, progresscb, category): """Resolve the troubles affecting one revision @@ -178,9 +180,7 @@ evolvestate.addopts(ops) evolvestate.save() repo.ui.write_err(_('evolve failed!\n')) - repo.ui.write_err( - _("fix conflict and run 'hg evolve --continue'" - " or use 'hg evolve --abort' to abort\n")) + repo.ui.write_err(abortmessage) raise def _solvephasedivergence(ui, repo, bumped, evolvestate, dryrun=False,
--- a/tests/test-evolve-abort-orphan.t Wed May 23 01:11:59 2018 +0530 +++ b/tests/test-evolve-abort-orphan.t Wed Jun 06 04:09:49 2018 +0530 @@ -86,7 +86,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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` abort: unresolved merge conflicts (see hg help resolve) [255]
--- a/tests/test-evolve-continue.t Wed May 23 01:11:59 2018 +0530 +++ b/tests/test-evolve-continue.t Wed Jun 06 04:09:49 2018 +0530 @@ -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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` abort: unresolved merge conflicts (see hg help resolve) [255] $ echo foo > g
--- a/tests/test-evolve-orphan-merge.t Wed May 23 01:11:59 2018 +0530 +++ b/tests/test-evolve-orphan-merge.t Wed Jun 06 04:09:49 2018 +0530 @@ -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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` abort: unresolved merge conflicts (see hg help resolve) [255]
--- a/tests/test-evolve-phase.t Wed May 23 01:11:59 2018 +0530 +++ b/tests/test-evolve-phase.t Wed Jun 06 04:09:49 2018 +0530 @@ -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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` abort: unresolved merge conflicts (see hg help resolve) [255]
--- a/tests/test-evolve-stop-orphan.t Wed May 23 01:11:59 2018 +0530 +++ b/tests/test-evolve-stop-orphan.t Wed Jun 06 04:09:49 2018 +0530 @@ -91,7 +91,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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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! - fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort + see `hg help evolve.interrupted-evolve` abort: unresolved merge conflicts (see hg help resolve) [255]
--- a/tests/test-evolve.t Wed May 23 01:11:59 2018 +0530 +++ b/tests/test-evolve.t Wed Jun 06 04:09:49 2018 +0530 @@ -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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` abort: unresolved merge conflicts (see hg help resolve) [255]
--- a/tests/test-issue-5720.t Wed May 23 01:11:59 2018 +0530 +++ b/tests/test-issue-5720.t Wed Jun 06 04:09:49 2018 +0530 @@ -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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` abort: unresolved merge conflicts (see hg help resolve) [255]
--- a/tests/test-stabilize-conflict.t Wed May 23 01:11:59 2018 +0530 +++ b/tests/test-stabilize-conflict.t Wed Jun 06 04:09:49 2018 +0530 @@ -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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` 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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` abort: unresolved merge conflicts (see hg help resolve) [255] $ hg resolve -l
--- a/tests/test-stabilize-result.t Wed May 23 01:11:59 2018 +0530 +++ b/tests/test-stabilize-result.t Wed Jun 06 04:09:49 2018 +0530 @@ -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 evolve --abort' to abort + see `hg help evolve.interrupted-evolve` abort: unresolved merge conflicts (see hg help resolve) [255] $ hg revert -r "orphan()" a