This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9593

test-narrow: mitigate the flakyness of test-narrow-shallow
ClosedPublic

Authored by marmoute on Dec 14 2020, 8:36 AM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG34f2c634c8f6: test-narrow: mitigate the flakyness of test-narrow-shallow
Summary

The actual bug still need fixing, but in the meantime the flakyness is wasting
everybody's time.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Dec 14 2020, 8:36 AM
pulkit accepted this revision.Dec 17 2020, 5:50 AM
This revision is now accepted and ready to land.Dec 17 2020, 5:50 AM

Revision Contents
Changeset List

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

Diff 24335

tests/test-narrow-shallow.t

7: Commit rev3 of f10, d1/f10, d2/f10 7: Commit rev3 of f10, d1/f10, d2/f10
6: Commit rev3 of f9, d1/f9, d2/f9 6: Commit rev3 of f9, d1/f9, d2/f9
5: Commit rev3 of f8, d1/f8, d2/f8 5: Commit rev3 of f8, d1/f8, d2/f8
4...: Commit rev3 of f7, d1/f7, d2/f7 4...: Commit rev3 of f7, d1/f7, d2/f7
3: Commit rev2 of f10, d1/f10, d2/f10 3: Commit rev2 of f10, d1/f10, d2/f10
2: Commit rev2 of f9, d1/f9, d2/f9 2: Commit rev2 of f9, d1/f9, d2/f9
1: Commit rev2 of f8, d1/f8, d2/f8 1: Commit rev2 of f8, d1/f8, d2/f8
0...: Commit rev2 of f7, d1/f7, d2/f7 0...: Commit rev2 of f7, d1/f7, d2/f7
XXX flaky output (see issue6150)
XXX
XXX The filectx implementation is buggy and return wrong data during status.
XXX Leading to more file being "merged". The right output is the one with just
XXX 10 files updated.
$ hg update 4 $ hg update 4
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 (?)
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