Mercurial > hg
diff tests/test-casecollision-merge.t @ 46866:7ce8b4d2bd55
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
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 03 Apr 2021 15:02:09 -0400 |
parents | f4f07cc92a47 |
children |
line wrap: on
line diff
--- 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