Show More
@@ -279,14 +279,12 b' class narrowfilelog(filelog):' | |||||
279 | return super(narrowfilelog, self).size(rev) |
|
279 | return super(narrowfilelog, self).size(rev) | |
280 |
|
280 | |||
281 | def cmp(self, node, text): |
|
281 | def cmp(self, node, text): | |
282 | different = super(narrowfilelog, self).cmp(node, text) |
|
282 | # We don't call `super` because narrow parents can be buggy in case of a | |
|
283 | # ambiguous dirstate. Always take the slow path until there is a better | |||
|
284 | # fix, see issue6150. | |||
283 |
|
285 | |||
284 | # Because renamed() may lie, we may get false positives for |
|
286 | # Censored files compare against the empty file. | |
285 | # different content. Check for this by comparing against the original |
|
287 | if self.iscensored(self.rev(node)): | |
286 | # renamed() implementation. |
|
288 | return text != b'' | |
287 | if different: |
|
|||
288 | if super(narrowfilelog, self).renamed(node): |
|
|||
289 | t2 = self.read(node) |
|
|||
290 | return t2 != text |
|
|||
291 |
|
289 | |||
292 |
return |
|
290 | return self.read(node) != text |
@@ -92,28 +92,8 b' directory but the shallow pull should on' | |||||
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 |
General Comments 0
You need to be logged in to leave comments.
Login now