diff -r 8fa87bce4929 -r 34f2c634c8f6 tests/test-narrow-shallow.t
--- a/tests/test-narrow-shallow.t	Mon Dec 14 18:03:29 2020 -0500
+++ b/tests/test-narrow-shallow.t	Mon Dec 14 14:31:15 2020 +0100
@@ -91,15 +91,23 @@
   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
-  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