changeset 43254 | 181d28ba05da |
parent 43253 | 82dabad535d2 |
child 43255 | b8d60845fa5d |
--- a/mercurial/copies.py Wed Oct 16 09:52:05 2019 +0200 +++ b/mercurial/copies.py Wed Oct 16 17:49:30 2019 +0200 @@ -207,12 +207,13 @@ return copies for i, c in enumerate(children[r]): childctx = repo[c] + p1, p2 = cl.parentrevs(c) p1copies, p2copies = childctx._copies - if r == childctx.p1().rev(): + if r == p1: parent = 1 childcopies = p1copies else: - assert r == childctx.p2().rev() + assert r == p2 parent = 2 childcopies = p2copies if not alwaysmatch: