Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: wider work around matching in test-narrow-shallow.t
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 14 Jan 2021 06:52:36 +0100
changeset 46258 b4c88c7daa4f
parent 46257 b918494198f7
child 46259 4e85439c1760
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
tests/test-narrow-shallow.t file | annotate | diff | comparison | revisions 
--- a/tests/test-narrow-shallow.t	Wed Jan 13 15:44:24 2021 -0500
+++ b/tests/test-narrow-shallow.t	Thu Jan 14 06:52:36 2021 +0100
@@ -107,6 +107,12 @@
   merging d2/f6 (?)
   merging d2/f7 (?)
   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 (?)
   $ cat d2/f7 d2/f8
   d2/f7 rev3
mercurial