Skip to content
Snippets Groups Projects
Commit b4c88c7daa4f authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

tests: wider work around matching in test-narrow-shallow.t

Since issue6150 is still not fixed, we have to accommodate a larger array of
possible results. Otherwise we get frequent flakiness of local and CI runs.

Differential Revision: https://phab.mercurial-scm.org/D9766
parent b918494198f7
No related branches found
No related tags found
No related merge requests found
...@@ -107,6 +107,12 @@ ...@@ -107,6 +107,12 @@
merging d2/f6 (?) merging d2/f6 (?)
merging d2/f7 (?) merging d2/f7 (?)
3 files updated, 7 files merged, 0 files removed, 0 files unresolved (?) 3 files updated, 7 files merged, 0 files removed, 0 files unresolved (?)
4 files updated, 6 files merged, 0 files removed, 0 files unresolved (?)
5 files updated, 5 files merged, 0 files removed, 0 files unresolved (?)
6 files updated, 4 files merged, 0 files removed, 0 files unresolved (?)
7 files updated, 3 files merged, 0 files removed, 0 files unresolved (?)
8 files updated, 2 files merged, 0 files removed, 0 files unresolved (?)
9 files updated, 1 files merged, 0 files removed, 0 files unresolved (?)
10 files updated, 0 files merged, 0 files removed, 0 files unresolved (?) 10 files updated, 0 files merged, 0 files removed, 0 files unresolved (?)
$ cat d2/f7 d2/f8 $ cat d2/f7 d2/f8
d2/f7 rev3 d2/f7 rev3
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment