Show More
@@ -207,13 +207,14 b' def _changesetforwardcopies(a, b, match)' | |||||
207 | return copies |
|
207 | return copies | |
208 | for i, c in enumerate(children[r]): |
|
208 | for i, c in enumerate(children[r]): | |
209 | childctx = repo[c] |
|
209 | childctx = repo[c] | |
|
210 | p1copies, p2copies = childctx._copies | |||
210 | if r == childctx.p1().rev(): |
|
211 | if r == childctx.p1().rev(): | |
211 | parent = 1 |
|
212 | parent = 1 | |
212 |
childcopies = |
|
213 | childcopies = p1copies | |
213 | else: |
|
214 | else: | |
214 | assert r == childctx.p2().rev() |
|
215 | assert r == childctx.p2().rev() | |
215 | parent = 2 |
|
216 | parent = 2 | |
216 |
childcopies = |
|
217 | childcopies = p2copies | |
217 | if not alwaysmatch: |
|
218 | if not alwaysmatch: | |
218 | childcopies = { |
|
219 | childcopies = { | |
219 | dst: src for dst, src in childcopies.items() if match(dst) |
|
220 | dst: src for dst, src in childcopies.items() if match(dst) |
General Comments 0
You need to be logged in to leave comments.
Login now