This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9766

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

Authored by marmoute on Jan 14 2021, 12:53 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGb4c88c7daa4f: tests: wider work around matching in test-narrow-shallow.t
rHG2e0ea4c4d534: tests: wider work around matching in test-narrow-shallow.t
Summary

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.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Jan 14 2021, 12:53 AM
marmoute added a commit: rHG2e0ea4c4d534: tests: wider work around matching in test-narrow-shallow.t.Jan 14 2021, 1:19 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG2e0ea4c4d534: tests: wider work around matching in test-narrow-shallow.t (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-narrow-shallow.t (6 lines)

Diff 24845

tests/test-narrow-shallow.t

merging d2/f1 (?) merging d2/f1 (?)
merging d2/f2 (?) merging d2/f2 (?)
merging d2/f3 (?) merging d2/f3 (?)
merging d2/f4 (?) merging d2/f4 (?)
merging d2/f5 (?) merging d2/f5 (?)
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
d2/f8 rev2 d2/f8 rev2
$ hg update 7 $ hg update 7
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat d2/f10 $ cat d2/f10
d2/f10 rev3 d2/f10 rev3