# HG changeset patch # User Matt Harbison # Date 1617476529 14400 # Node ID 7ce8b4d2bd55f100de4faec766bcf177832079b6 # Parent 466236e99eac18db6286a95297bcc715d6170f28 tests: update the detailed exit codes for icasefs gated tests The fact that there's already a detailed exit code after the last change here in test-casecollision-merge.t gives me some pause, but maybe it was found and changed manually? Differential Revision: https://phab.mercurial-scm.org/D10298 diff -r 466236e99eac -r 7ce8b4d2bd55 tests/test-casecollision-merge.t --- a/tests/test-casecollision-merge.t Sat Apr 03 15:00:20 2021 -0400 +++ b/tests/test-casecollision-merge.t Sat Apr 03 15:02:09 2021 -0400 @@ -145,7 +145,7 @@ $ hg merge abort: case-folding collision between [aA] and [Aa] (re) - [255] + [20] $ hg parents --template '{rev}\n' 4 $ hg status -A @@ -158,7 +158,7 @@ 1 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg merge abort: case-folding collision between [aA] and [Aa] (re) - [255] + [20] $ hg parents --template '{rev}\n' 2 $ hg status -A @@ -213,7 +213,7 @@ $ hg merge 0 abort: case-folding collision between Aa and directory of aA/a - [255] + [20] (note: no collision between 0 and 00 or 000/f) Directory case-folding collision: @@ -328,7 +328,7 @@ A B $ hg update abort: case-folding collision between [bB] and [Bb] (re) - [255] + [20] $ hg update --check abort: uncommitted changes diff -r 466236e99eac -r 7ce8b4d2bd55 tests/test-casefolding.t --- a/tests/test-casefolding.t Sat Apr 03 15:00:20 2021 -0400 +++ b/tests/test-casefolding.t Sat Apr 03 15:02:09 2021 -0400 @@ -115,7 +115,7 @@ $ hg up A: untracked file differs abort: untracked files in working directory differ from files in requested revision - [255] + [20] $ cat a gold $ rm a