##// END OF EJS Templates
tests: update the detailed exit codes for icasefs gated tests...
Matt Harbison -
r47625:7ce8b4d2 default
parent child Browse files
Show More
@@ -145,7 +145,7 b" target file is not 'a'/'A' but 'b'/'B' i"
145
145
146 $ hg merge
146 $ hg merge
147 abort: case-folding collision between [aA] and [Aa] (re)
147 abort: case-folding collision between [aA] and [Aa] (re)
148 [255]
148 [20]
149 $ hg parents --template '{rev}\n'
149 $ hg parents --template '{rev}\n'
150 4
150 4
151 $ hg status -A
151 $ hg status -A
@@ -158,7 +158,7 b" target file is not 'a'/'A' but 'b'/'B' i"
158 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
158 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
159 $ hg merge
159 $ hg merge
160 abort: case-folding collision between [aA] and [Aa] (re)
160 abort: case-folding collision between [aA] and [Aa] (re)
161 [255]
161 [20]
162 $ hg parents --template '{rev}\n'
162 $ hg parents --template '{rev}\n'
163 2
163 2
164 $ hg status -A
164 $ hg status -A
@@ -213,7 +213,7 b' Directory/file case-folding collision:'
213
213
214 $ hg merge 0
214 $ hg merge 0
215 abort: case-folding collision between Aa and directory of aA/a
215 abort: case-folding collision between Aa and directory of aA/a
216 [255]
216 [20]
217 (note: no collision between 0 and 00 or 000/f)
217 (note: no collision between 0 and 00 or 000/f)
218
218
219 Directory case-folding collision:
219 Directory case-folding collision:
@@ -328,7 +328,7 b' test for rename awareness of case-foldin'
328 A B
328 A B
329 $ hg update
329 $ hg update
330 abort: case-folding collision between [bB] and [Bb] (re)
330 abort: case-folding collision between [bB] and [Bb] (re)
331 [255]
331 [20]
332
332
333 $ hg update --check
333 $ hg update --check
334 abort: uncommitted changes
334 abort: uncommitted changes
@@ -115,7 +115,7 b' no clobbering of untracked files with wr'
115 $ hg up
115 $ hg up
116 A: untracked file differs
116 A: untracked file differs
117 abort: untracked files in working directory differ from files in requested revision
117 abort: untracked files in working directory differ from files in requested revision
118 [255]
118 [20]
119 $ cat a
119 $ cat a
120 gold
120 gold
121 $ rm a
121 $ rm a
General Comments 0
You need to be logged in to leave comments. Login now