89 4...: Commit rev3 of f7, d1/f7, d2/f7 |
89 4...: Commit rev3 of f7, d1/f7, d2/f7 |
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 |
|
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 |
94 $ hg update 4 |
101 $ hg update 4 |
95 merging d2/f1 |
102 merging d2/f1 (?) |
96 merging d2/f2 |
103 merging d2/f2 (?) |
97 merging d2/f3 |
104 merging d2/f3 (?) |
98 merging d2/f4 |
105 merging d2/f4 (?) |
99 merging d2/f5 |
106 merging d2/f5 (?) |
100 merging d2/f6 |
107 merging d2/f6 (?) |
101 merging d2/f7 |
108 merging d2/f7 (?) |
102 3 files updated, 7 files merged, 0 files removed, 0 files unresolved |
109 3 files updated, 7 files merged, 0 files removed, 0 files unresolved (?) |
|
110 10 files updated, 0 files merged, 0 files removed, 0 files unresolved (?) |
103 $ cat d2/f7 d2/f8 |
111 $ cat d2/f7 d2/f8 |
104 d2/f7 rev3 |
112 d2/f7 rev3 |
105 d2/f8 rev2 |
113 d2/f8 rev2 |
106 $ hg update 7 |
114 $ hg update 7 |
107 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
115 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |