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

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

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

Differential Revision: https://phab.mercurial-scm.org/D9593
parent 8fa87bce4929
No related branches found
No related tags found
No related merge requests found
......@@ -91,4 +91,11 @@
2: Commit rev2 of f9, d1/f9, d2/f9
1: Commit rev2 of f8, d1/f8, d2/f8
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
......@@ -94,12 +101,13 @@
$ hg update 4
merging d2/f1
merging d2/f2
merging d2/f3
merging d2/f4
merging d2/f5
merging d2/f6
merging d2/f7
3 files updated, 7 files merged, 0 files removed, 0 files unresolved
merging d2/f1 (?)
merging d2/f2 (?)
merging d2/f3 (?)
merging d2/f4 (?)
merging d2/f5 (?)
merging d2/f6 (?)
merging d2/f7 (?)
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
d2/f7 rev3
d2/f8 rev2
......
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