Mercurial > evolve
changeset 4676:b6c819facbe8
evolvecmd: the proper way to deal with conflicts is to resolve them
And it's worth making the suggestion an actual hint.
line wrap: on
line diff
--- a/CHANGELOG Fri Jun 07 02:25:02 2019 +0200 +++ b/CHANGELOG Thu Jun 06 17:37:42 2019 +0800 @@ -1,6 +1,11 @@ Changelog ========= +9.1.0 - in progress +------------------- + + * evolve: use the same wording as core in case of unresolved conflict + 9.0.0 -- 2019-06-06 -------------------
--- a/hgext3rd/evolve/evolvecmd.py Fri Jun 07 02:25:02 2019 +0200 +++ b/hgext3rd/evolve/evolvecmd.py Thu Jun 06 17:37:42 2019 +0800 @@ -578,8 +578,9 @@ # conflicts while merging content-divergent changesets if compat.hasconflict(stats): evolvestate.save() - raise error.InterventionRequired(_("fix conflicts and see `hg help " - "evolve.interrupted`")) + hint = _("see 'hg help evolve.interrupted'") + raise error.InterventionRequired(_("unresolved merge conflicts"), + hint=hint) def _completecontentdivergent(ui, repo, progresscb, divergent, other, base, evolvestate): @@ -984,8 +985,9 @@ copies.duplicatecopies(repo, repo[None], dest.rev(), orig.p1().rev()) dirstatedance(repo, dest, orig.node(), None) - raise error.InterventionRequired(_("fix conflicts and see `hg help " - "evolve.interrupted`")) + hint = _("see 'hg help evolve.interrupted'") + raise error.InterventionRequired(_("unresolved merge conflicts"), + hint=hint) nodenew = _relocatecommit(repo, orig, commitmsg) _finalizerelocate(repo, orig, dest, nodenew, tr, category, evolvestate) return nodenew @@ -1593,8 +1595,8 @@ situation: - `hg evolve --continue`: - fix all the conflicts using `hg resolve` and then run this to continue the - interrupted evolve + resolve 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,
--- a/tests/test-evolve-abort-orphan.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-abort-orphan.t Thu Jun 06 17:37:42 2019 +0800 @@ -85,7 +85,8 @@ atop:[5] added c merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg parents @@ -132,7 +133,8 @@ atop:[5] added c merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo foo > d $ hg resolve -m @@ -159,7 +161,8 @@ move:[5] added c merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] testing that interrupted evolve shows up in morestatus @@ -270,7 +273,8 @@ atop:[7] added a merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg glog @@ -334,7 +338,8 @@ atop:[7] added a merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg glog o 9:7f8e8bd9f0b6 added c @@ -411,7 +416,8 @@ atop:[7] added a merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg glog @@ -486,7 +492,8 @@ move:[3] added c merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg glog @@ -532,7 +539,8 @@ atop:[5] added b merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --abort
--- a/tests/test-evolve-abort-phasediv.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-abort-phasediv.t Thu Jun 06 17:37:42 2019 +0800 @@ -87,7 +87,8 @@ rebasing to destination parent: ca1b80f7960a merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] testing that interrupted evolve shows up in morestatus @@ -213,7 +214,8 @@ rebasing to destination parent: b1661037fa25 merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --abort @@ -282,7 +284,8 @@ rebasing to destination parent: b1661037fa25 merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo watwat > c @@ -297,7 +300,8 @@ rebasing to destination parent: ca1b80f7960a merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --abort
--- a/tests/test-evolve-content-divergent-basic.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-content-divergent-basic.t Thu Jun 06 17:37:42 2019 +0800 @@ -340,7 +340,8 @@ 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 - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo foobar > d @@ -399,7 +400,8 @@ 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 - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo watbar > d @@ -609,7 +611,8 @@ 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 - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ cat > a <<EOF
--- a/tests/test-evolve-content-divergent-corner-cases.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-content-divergent-corner-cases.t Thu Jun 06 17:37:42 2019 +0800 @@ -277,7 +277,8 @@ rebasing "other" content-divergent changeset de4ea3103326 on 9150fe93bec6 merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg diff --no-git --config diff.unified=3
--- a/tests/test-evolve-content-divergent-interrupted.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-content-divergent-interrupted.t Thu Jun 06 17:37:42 2019 +0800 @@ -86,7 +86,8 @@ 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 - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg status -v @@ -197,7 +198,8 @@ 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 - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --abort @@ -303,7 +305,8 @@ rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --abort @@ -356,7 +359,8 @@ 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 - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --abort @@ -447,7 +451,8 @@ 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 - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --stop @@ -499,7 +504,8 @@ 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 - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --stop @@ -548,7 +554,8 @@ rebasing "other" content-divergent changeset 8fd1c4bd144c on ca1b80f7960a merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg diff
--- a/tests/test-evolve-content-divergent-relocation.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-content-divergent-relocation.t Thu Jun 06 17:37:42 2019 +0800 @@ -255,7 +255,8 @@ 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 - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo watbar > y @@ -389,7 +390,8 @@ rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf merging y warning: conflicts while merging y! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg diff @@ -418,7 +420,8 @@ 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 - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg diff
--- a/tests/test-evolve-continue.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-continue.t Thu Jun 06 17:37:42 2019 +0800 @@ -58,7 +58,8 @@ atop:[5] added c merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo foo > d @@ -118,7 +119,8 @@ atop:[8] added d merging e warning: conflicts while merging e! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo bar > e @@ -158,7 +160,8 @@ atop:[9] added a merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo foo > b @@ -242,7 +245,8 @@ move:[13] added f merging f warning: conflicts while merging f! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo foo > f @@ -256,7 +260,8 @@ move:[15] added h merging h warning: conflicts while merging h! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo foo > h @@ -302,7 +307,8 @@ perform evolve? [Ny] y merging g warning: conflicts while merging g! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo foo > g @@ -350,7 +356,8 @@ atop:[24] added f merging g warning: conflicts while merging g! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo foo > g $ hg resolve -m @@ -416,7 +423,8 @@ atop:[5] added c merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] Status mentions file 'b' (copied from 'a') here, even though it wasn't
--- a/tests/test-evolve-issue5966.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-issue5966.t Thu Jun 06 17:37:42 2019 +0800 @@ -57,7 +57,8 @@ $ hg evolve -t :fail --rev 'first(orphan())' move:[2] banana atop:[4] apricot - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --list 34a690fcf6ab: banana
--- a/tests/test-evolve-orphan-merge.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-orphan-merge.t Thu Jun 06 17:37:42 2019 +0800 @@ -219,7 +219,8 @@ atop:[11] foo to c merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo FOObar > c @@ -274,7 +275,8 @@ atop:[13] foo to c merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo foobar > c
--- a/tests/test-evolve-phase-divergence.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-phase-divergence.t Thu Jun 06 17:37:42 2019 +0800 @@ -807,7 +807,8 @@ rebasing to destination parent: 8c2bb6fb44e9 merging x warning: conflicts while merging x! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg diff
--- a/tests/test-evolve-phase.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-phase.t Thu Jun 06 17:37:42 2019 +0800 @@ -85,7 +85,8 @@ atop:[3] b merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg diff
--- a/tests/test-evolve-progress.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-progress.t Thu Jun 06 17:37:42 2019 +0800 @@ -135,7 +135,8 @@ picked tool ':merge' for a (binary False symlink False changedelete False) my a@f8d7d38c0a88+ other a@df5d742141b0 ancestor a@152c368c622b warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo resolved > a $ hg resolve -m a
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Thu Jun 06 17:37:42 2019 +0800 @@ -389,7 +389,8 @@ rebasing "other" content-divergent changeset e568fd1029bb on 155349b645be merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg diff @@ -419,7 +420,8 @@ What do you want to do? use (c)hanged version, (d)elete, or leave (u)nresolved? u 1 files updated, 0 files merged, 0 files removed, 1 files unresolved - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg sum
--- a/tests/test-evolve-public-content-divergent-discard.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-public-content-divergent-discard.t Thu Jun 06 17:37:42 2019 +0800 @@ -269,7 +269,8 @@ merging ch warning: conflicts while merging ch! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg diff @@ -383,7 +384,8 @@ rebasing "other" content-divergent changeset f89a8e2f86ac on 155349b645be merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo c > c @@ -488,7 +490,8 @@ merging dh warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo dh > dh @@ -591,7 +594,8 @@ rebasing "other" content-divergent changeset 67b19bbd770f on 155349b645be merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo c > c @@ -604,7 +608,8 @@ merging dh warning: conflicts while merging dh! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo dh > dh
--- a/tests/test-evolve-public-content-divergent-main.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-public-content-divergent-main.t Thu Jun 06 17:37:42 2019 +0800 @@ -170,7 +170,8 @@ merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo "I am foobar" > b @@ -356,7 +357,8 @@ rebasing "other" content-divergent changeset f31bcc378766 on 155349b645be merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg diff @@ -486,7 +488,8 @@ 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 - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo d > d @@ -578,7 +581,8 @@ rebasing "other" content-divergent changeset 3c17c7afaf6e on 155349b645be merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg diff @@ -612,7 +616,8 @@ merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') 2 files updated, 0 files merged, 0 files removed, 1 files unresolved - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo d > d
--- a/tests/test-evolve-stop-orphan.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-stop-orphan.t Thu Jun 06 17:37:42 2019 +0800 @@ -90,7 +90,8 @@ atop:[5] added c merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --stop @@ -135,7 +136,8 @@ atop:[5] added c merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg diff @@ -196,7 +198,8 @@ atop:[5] added c merging d warning: conflicts while merging d! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo foo > d $ hg resolve -m @@ -245,7 +248,8 @@ move:[5] added c merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg status @@ -282,7 +286,8 @@ atop:[9] added b merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo foobar > c @@ -357,7 +362,8 @@ move:[10] added c merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --stop
--- a/tests/test-evolve-stop-phasediv.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-stop-phasediv.t Thu Jun 06 17:37:42 2019 +0800 @@ -84,7 +84,8 @@ rebasing to destination parent: ca1b80f7960a merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg evolve --stop
--- a/tests/test-evolve-topic.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve-topic.t Thu Jun 06 17:37:42 2019 +0800 @@ -426,7 +426,8 @@ move:[s3] add hhh merging hhh warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ echo "resolved hhh" > hhh $ hg resolve --mark hhh
--- a/tests/test-evolve.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-evolve.t Thu Jun 06 17:37:42 2019 +0800 @@ -1389,7 +1389,8 @@ move:[31] will cause conflict at evolve merging newfile warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ glog -r "desc('add unstableifparentisfolded')::" --hidden
--- a/tests/test-issue-5720.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-issue-5720.t Thu Jun 06 17:37:42 2019 +0800 @@ -61,7 +61,8 @@ atop:[3] b merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] Fix the conflict
--- a/tests/test-stabilize-conflict.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-stabilize-conflict.t Thu Jun 06 17:37:42 2019 +0800 @@ -128,7 +128,8 @@ atop:[5] babar count up to ten merging babar warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg resolve -l U babar @@ -220,7 +221,8 @@ output file babar appears unchanged was merge successful (yn)? n merging babar failed! - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg resolve -l U babar
--- a/tests/test-unstability-resolution-result.t Fri Jun 07 02:25:02 2019 +0200 +++ b/tests/test-unstability-resolution-result.t Thu Jun 06 17:37:42 2019 +0800 @@ -90,7 +90,8 @@ atop:[5] changea merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') - fix conflicts and see `hg help evolve.interrupted` + unresolved merge conflicts + (see 'hg help evolve.interrupted') [1] $ hg revert -r "orphan()" a $ hg diff