Mercurial > hg-stable
comparison tests/test-narrow-shallow.t @ 46376:b994db7c4d1e stable
narrow: fix flaky behavior described in issue6150
This has been plaguing the CI for a good while, and it doesn't appear to have
an easy fix proposed yet. The solution in this change is to always do an
unambiguous (but expensive) lookup in case of comparison. This should always
be correct, albeit suboptimal.
Differential Revision: https://phab.mercurial-scm.org/D10034
| author | Raphaël Gomès <rgomes@octobus.net> |
|---|---|
| date | Fri, 19 Feb 2021 17:52:04 +0100 |
| parents | b4c88c7daa4f |
| children | 3f87d2af0bd6 |
comparison
equal
deleted
inserted
replaced
| 46375:33350debb480 | 46376:b994db7c4d1e |
|---|---|
| 90 3: Commit rev2 of f10, d1/f10, d2/f10 | 90 3: Commit rev2 of f10, d1/f10, d2/f10 |
| 91 2: Commit rev2 of f9, d1/f9, d2/f9 | 91 2: Commit rev2 of f9, d1/f9, d2/f9 |
| 92 1: Commit rev2 of f8, d1/f8, d2/f8 | 92 1: Commit rev2 of f8, d1/f8, d2/f8 |
| 93 0...: Commit rev2 of f7, d1/f7, d2/f7 | 93 0...: Commit rev2 of f7, d1/f7, d2/f7 |
| 94 | 94 |
| 95 XXX flaky output (see issue6150) | |
| 96 XXX | |
| 97 XXX The filectx implementation is buggy and return wrong data during status. | |
| 98 XXX Leading to more file being "merged". The right output is the one with just | |
| 99 XXX 10 files updated. | |
| 100 | |
| 101 $ hg update 4 | 95 $ hg update 4 |
| 102 merging d2/f1 (?) | 96 10 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 103 merging d2/f2 (?) | |
| 104 merging d2/f3 (?) | |
| 105 merging d2/f4 (?) | |
| 106 merging d2/f5 (?) | |
| 107 merging d2/f6 (?) | |
| 108 merging d2/f7 (?) | |
| 109 3 files updated, 7 files merged, 0 files removed, 0 files unresolved (?) | |
| 110 4 files updated, 6 files merged, 0 files removed, 0 files unresolved (?) | |
| 111 5 files updated, 5 files merged, 0 files removed, 0 files unresolved (?) | |
| 112 6 files updated, 4 files merged, 0 files removed, 0 files unresolved (?) | |
| 113 7 files updated, 3 files merged, 0 files removed, 0 files unresolved (?) | |
| 114 8 files updated, 2 files merged, 0 files removed, 0 files unresolved (?) | |
| 115 9 files updated, 1 files merged, 0 files removed, 0 files unresolved (?) | |
| 116 10 files updated, 0 files merged, 0 files removed, 0 files unresolved (?) | |
| 117 $ cat d2/f7 d2/f8 | 97 $ cat d2/f7 d2/f8 |
| 118 d2/f7 rev3 | 98 d2/f7 rev3 |
| 119 d2/f8 rev2 | 99 d2/f8 rev2 |
| 120 $ hg update 7 | 100 $ hg update 7 |
| 121 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 101 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |