Mercurial > evolve
changeset 5666:e5d91fd1f319
tests: update with more detailed exit codes
CORE-TEST-OUTPUT-UPDATE: 21733e8c924f
CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0
CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c
CORE-TEST-OUTPUT-UPDATE: ebee234d952a
CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60
CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b
CORE-TEST-OUTPUT-UPDATE: f96fa4de5055
CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
line wrap: on
line diff
--- a/tests/test-amend-patch.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-amend-patch.t Thu Nov 19 08:28:45 2020 -0800 @@ -666,7 +666,7 @@ $ hg add bar $ HGEDITOR=cat hg amend --patch abort: uncommitted changes - [255] + [20] $ hg revert --all forgetting bar
--- a/tests/test-evolve-abort-orphan.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-abort-orphan.t Thu Nov 19 08:28:45 2020 -0800 @@ -56,7 +56,7 @@ #else $ hg abort abort: no operation in progress - [255] + [20] #endif Testing with wrong combination of flags @@ -101,7 +101,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg parents changeset: 5:e93a9161a274 @@ -148,7 +148,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foo > d $ hg resolve -m (no more unresolved files) @@ -176,7 +176,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] testing that interrupted evolve shows up in morestatus $ hg status -v @@ -288,7 +288,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg glog o 9:7f8e8bd9f0b6 added c @@ -353,7 +353,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg glog o 9:7f8e8bd9f0b6 added c | () draft @@ -431,7 +431,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg glog o 12:1c476940790a added d @@ -507,7 +507,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg glog @ 5:c1f4718020e3 added b @@ -554,7 +554,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg abort evolve aborted
--- a/tests/test-evolve-abort-phasediv.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-abort-phasediv.t Thu Nov 19 08:28:45 2020 -0800 @@ -97,7 +97,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] testing that interrupted evolve shows up in morestatus $ hg status -v @@ -216,7 +216,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg abort 1 new phase-divergent changesets @@ -286,7 +286,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo watwat > c $ hg resolve -m @@ -302,7 +302,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg abort 1 new phase-divergent changesets
--- a/tests/test-evolve-content-divergent-basic.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-content-divergent-basic.t Thu Nov 19 08:28:45 2020 -0800 @@ -344,7 +344,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foobar > d $ hg resolve -m @@ -404,7 +404,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo watbar > d $ hg resolve -m @@ -615,7 +615,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ cat > a <<EOF > jungle
--- a/tests/test-evolve-content-divergent-interrupted.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-content-divergent-interrupted.t Thu Nov 19 08:28:45 2020 -0800 @@ -90,7 +90,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg status -v M d @@ -204,7 +204,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg evolve --abort 2 new orphan changesets @@ -312,7 +312,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg evolve --abort evolve aborted @@ -366,7 +366,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg evolve --abort evolve aborted @@ -458,7 +458,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg evolve --stop stopped the interrupted evolve @@ -511,7 +511,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg evolve --stop stopped the interrupted evolve @@ -561,7 +561,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg diff diff -r ca1b80f7960a c
--- a/tests/test-evolve-content-divergent-relocation.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-content-divergent-relocation.t Thu Nov 19 08:28:45 2020 -0800 @@ -310,7 +310,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo watbar > y $ hg resolve -m @@ -464,7 +464,7 @@ warning: conflicts while merging y! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg diff diff -r 7411ed2cf7cf y @@ -494,7 +494,7 @@ 1 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg diff diff -r 635c0edd2e45 y
--- a/tests/test-evolve-content-divergent-stack.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-content-divergent-stack.t Thu Nov 19 08:28:45 2020 -0800 @@ -272,7 +272,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo c > c $ hg res -m (no more unresolved files) @@ -285,7 +285,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg diff diff -r 5907cbc074a0 c --- a/c Thu Jan 01 00:00:00 1970 +0000 @@ -542,7 +542,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo b > b $ hg res -m @@ -555,7 +555,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo b > b $ hg res -m @@ -644,7 +644,7 @@ 4 new orphan changesets unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] As now we have interrupted evolution of stack of content-divergent cset (when relocation of "divergent" also included) let's test --abort and --stop @@ -745,7 +745,7 @@ 4 new orphan changesets unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg evolve --stop 2 new orphan changesets @@ -865,7 +865,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foo > b $ hg res -m
--- a/tests/test-evolve-continue.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-continue.t Thu Nov 19 08:28:45 2020 -0800 @@ -60,7 +60,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foo > d $ hg resolve -m @@ -121,7 +121,7 @@ warning: conflicts while merging e! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo bar > e $ hg resolve -m @@ -162,7 +162,7 @@ warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foo > b $ hg resolve -m @@ -247,7 +247,7 @@ warning: conflicts while merging f! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foo > f $ hg resolve -m @@ -262,7 +262,7 @@ warning: conflicts while merging h! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foo > h $ hg resolve -m @@ -309,7 +309,7 @@ warning: conflicts while merging g! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foo > g $ hg resolve -m @@ -358,7 +358,7 @@ warning: conflicts while merging g! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foo > g $ hg resolve -m (no more unresolved files) @@ -425,7 +425,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] Status mentions file 'b' (copied from 'a') here, even though it wasn't affected by the evolved changeset (nor was 'a') @@ -455,7 +455,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg st -C M a A d
--- a/tests/test-evolve-issue5966.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-issue5966.t Thu Nov 19 08:28:45 2020 -0800 @@ -59,7 +59,7 @@ atop:[4] apricot unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg evolve --list 34a690fcf6ab: banana orphan: 7f59f18ca4a9 (obsolete parent)
--- a/tests/test-evolve-issue5967.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-issue5967.t Thu Nov 19 08:28:45 2020 -0800 @@ -43,7 +43,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo apricot > a $ hg resolve --mark a
--- a/tests/test-evolve-orphan-merge.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-orphan-merge.t Thu Nov 19 08:28:45 2020 -0800 @@ -210,7 +210,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo FOObar > c $ hg resolve -m @@ -266,7 +266,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foobar > c $ hg resolve -m
--- a/tests/test-evolve-phase-divergence.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-phase-divergence.t Thu Nov 19 08:28:45 2020 -0800 @@ -860,7 +860,7 @@ warning: conflicts while merging x! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg diff diff -r 8c2bb6fb44e9 l
--- a/tests/test-evolve-phase.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-phase.t Thu Nov 19 08:28:45 2020 -0800 @@ -87,7 +87,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg diff diff -r 87495ea7c9ec a
--- a/tests/test-evolve-progress.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-progress.t Thu Nov 19 08:28:45 2020 -0800 @@ -136,7 +136,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo resolved > a $ hg resolve -m a (no more unresolved files)
--- a/tests/test-evolve-public-content-divergent-corner-cases.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-public-content-divergent-corner-cases.t Thu Nov 19 08:28:45 2020 -0800 @@ -396,7 +396,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg diff diff -r 155349b645be c @@ -427,7 +427,7 @@ 1 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg sum parent: 5:93cd84bbdaca
--- a/tests/test-evolve-public-content-divergent-discard.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-public-content-divergent-discard.t Thu Nov 19 08:28:45 2020 -0800 @@ -273,7 +273,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg diff diff -r f7c1071f1e7c ch @@ -388,7 +388,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo c > c $ hg res -m @@ -494,7 +494,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo dh > dh $ hg res -m @@ -598,7 +598,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo c > c $ hg res -m @@ -612,7 +612,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo dh > dh $ hg res -m
--- a/tests/test-evolve-public-content-divergent-main.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-public-content-divergent-main.t Thu Nov 19 08:28:45 2020 -0800 @@ -174,7 +174,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo "I am foobar" > b $ hg resolve -m --tool union @@ -361,7 +361,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg diff diff -r 155349b645be c @@ -492,7 +492,7 @@ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo d > d $ hg res -m @@ -585,7 +585,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg diff diff -r 155349b645be c @@ -620,7 +620,7 @@ 2 files updated, 0 files merged, 0 files removed, 1 files unresolved unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo d > d $ hg res -m
--- a/tests/test-evolve-serveronly-legacy.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-serveronly-legacy.t Thu Nov 19 08:28:45 2020 -0800 @@ -59,5 +59,5 @@ abort: remote error: incompatible Mercurial client; bundle2 required (see https://www.mercurial-scm.org/wiki/IncompatibleClient) - [255] + [100] $ cat ../errors.log
--- a/tests/test-evolve-stop-orphan.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-stop-orphan.t Thu Nov 19 08:28:45 2020 -0800 @@ -92,7 +92,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg evolve --stop stopped the interrupted evolve @@ -138,7 +138,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg diff diff -r cb6a2ab625bb d @@ -200,7 +200,7 @@ warning: conflicts while merging d! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foo > d $ hg resolve -m (no more unresolved files) @@ -250,7 +250,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg status M c @@ -288,7 +288,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo foobar > c $ hg resolve -m @@ -364,7 +364,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg evolve --stop stopped the interrupted evolve
--- a/tests/test-evolve-stop-phasediv.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-stop-phasediv.t Thu Nov 19 08:28:45 2020 -0800 @@ -86,7 +86,7 @@ warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg evolve --stop stopped the interrupted evolve
--- a/tests/test-evolve-topic.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve-topic.t Thu Nov 19 08:28:45 2020 -0800 @@ -428,7 +428,7 @@ warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ echo "resolved hhh" > hhh $ hg resolve --mark hhh (no more unresolved files)
--- a/tests/test-evolve.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-evolve.t Thu Nov 19 08:28:45 2020 -0800 @@ -628,7 +628,7 @@ merging 1 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [1] + [240] $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' 7:a5bfd90a2f29 $ echo 3 > 1 @@ -1394,7 +1394,7 @@ warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ glog -r "desc('add unstableifparentisfolded')::" --hidden @ 33:b9acdb1af6d5@default(draft) will be evolved safely
--- a/tests/test-issue-5720.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-issue-5720.t Thu Nov 19 08:28:45 2020 -0800 @@ -63,7 +63,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] Fix the conflict $ echo c2 > a
--- a/tests/test-obsolete.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-obsolete.t Thu Nov 19 08:28:45 2020 -0800 @@ -175,7 +175,7 @@ $ hg init ../other-new $ hg phase --draft 'secret() - extinct()' # until we fix exclusion abort: empty revision set - [255] + [10] $ hg push ../other-new pushing to ../other-new searching for changes
--- a/tests/test-pick.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-pick.t Thu Nov 19 08:28:45 2020 -0800 @@ -90,7 +90,7 @@ #if abortcommand $ hg abort abort: no operation in progress - [255] + [20] #endif Specifying both continue and revs @@ -197,7 +197,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [1] + [240] $ echo foobar > c $ hg resolve --all --mark @@ -235,7 +235,7 @@ merging c warning: conflicts while merging c! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [1] + [240] $ echo foobar > c $ hg resolve -m (no more unresolved files) @@ -260,7 +260,7 @@ merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [1] + [240] #if abortcommand $ hg abort --dry-run @@ -320,7 +320,7 @@ merging b warning: conflicts while merging b! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [1] + [240] $ echo bar > b $ hg resolve -m @@ -459,7 +459,7 @@ merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see hg help resolve) - [1] + [240] $ hg resolve -t :other a (no more unresolved files) continue: hg pick --continue
--- a/tests/test-prev-next.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-prev-next.t Thu Nov 19 08:28:45 2020 -0800 @@ -125,14 +125,14 @@ $ hg prev abort: uncommitted changes (do you want --merge?) - [255] + [20] $ hg prev --merge 0 files updated, 0 files merged, 1 files removed, 0 files unresolved [0] added a $ hg next abort: uncommitted changes (do you want --merge?) - [255] + [20] $ hg next --merge 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [1] added b @@ -376,7 +376,7 @@ $ hg next --evolve abort: uncommitted changes (use `hg amend`, `hg revert` or `hg shelve`) - [255] + [20] $ cd .. @@ -467,7 +467,7 @@ $ hg prev --config commands.update.check=abort abort: uncommitted changes (do you want --merge?) - [255] + [20] $ hg prev --merge --config commands.update.check=abort file 'bar' was deleted in other [destination] but was modified in local [working copy]. You can use (c)hanged version, (d)elete, or leave (u)nresolved. @@ -488,7 +488,7 @@ $ hg next --config commands.update.check=abort abort: uncommitted changes (do you want --merge?) - [255] + [20] $ hg next --merge --config commands.update.check=abort merging bar warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
--- a/tests/test-rewind.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-rewind.t Thu Nov 19 08:28:45 2020 -0800 @@ -1191,10 +1191,10 @@ $ hg rewind --to 'desc("amended")' --hidden abort: uncommitted changes - [255] + [20] XXX: Unfortunately, even with --keep it's not allowed $ hg rewind --keep --to 'desc("amended")' --hidden abort: uncommitted changes - [255] + [20]
--- a/tests/test-split.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-split.t Thu Nov 19 08:28:45 2020 -0800 @@ -138,7 +138,7 @@ $ echo "_cd" > _c $ hg split abort: uncommitted changes - [255] + [20] $ hg up "desc(_c)" -C 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-stabilize-conflict.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-stabilize-conflict.t Thu Nov 19 08:28:45 2020 -0800 @@ -130,7 +130,7 @@ warning: conflicts while merging babar! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg resolve -l U babar $ hg log -G @@ -223,7 +223,7 @@ merging babar failed! unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg resolve -l U babar $ hg log -G
--- a/tests/test-topic-rebase.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-topic-rebase.t Thu Nov 19 08:28:45 2020 -0800 @@ -128,7 +128,7 @@ warning: conflicts while merging file! (edit, then use 'hg resolve --mark') switching to topic myotherfeature unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') - [1] + [240] Resolve the conflict $ echo A2 > file
--- a/tests/test-topic.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-topic.t Thu Nov 19 08:28:45 2020 -0800 @@ -271,16 +271,16 @@ $ hg topic '.' abort: the name '.' is reserved - [255] + [10] $ hg topic null abort: the name 'null' is reserved - [255] + [10] $ hg topic tip abort: the name 'tip' is reserved - [255] + [10] $ hg topic 12345 abort: cannot use an integer as a name - [255] + [10] $ hg topic ' ' abort: topic name cannot consist entirely of whitespaces [255] @@ -317,7 +317,7 @@ HG: branch 'default' HG: changed alpha abort: empty commit message - [255] + [10] $ hg revert alpha $ hg topic * topicflag (0 changesets)
--- a/tests/test-unstability-resolution-result.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-unstability-resolution-result.t Thu Nov 19 08:28:45 2020 -0800 @@ -92,7 +92,7 @@ warning: conflicts while merging a! (edit, then use 'hg resolve --mark') unresolved merge conflicts (see 'hg help evolve.interrupted') - [1] + [240] $ hg revert -r "orphan()" a $ hg diff diff -r 66719795a494 a
--- a/tests/test-wireproto.t Mon Nov 16 13:08:08 2020 -0800 +++ b/tests/test-wireproto.t Thu Nov 19 08:28:45 2020 -0800 @@ -202,7 +202,7 @@ $ hg debugpushkey http://localhost:$HGPORT/ obsolete abort: HTTP Error 410: won't exchange obsmarkers through pushkey - [255] + [100] $ cat errors.log $ hg debugpushkey ssh://user@dummy/server obsolete remote: abort: won't exchange obsmarkers through pushkey