diff -r 3461814417f3 -r 0bd56c291359 hgext/largefiles/lfcommands.py --- a/hgext/largefiles/lfcommands.py Mon Jan 21 15:29:14 2019 +0000 +++ b/hgext/largefiles/lfcommands.py Fri Jan 25 23:36:23 2019 -0800 @@ -288,8 +288,8 @@ files = set(ctx.files()) if node.nullid not in parents: mc = ctx.manifest() - mp1 = ctx.parents()[0].manifest() - mp2 = ctx.parents()[1].manifest() + mp1 = ctx.p1().manifest() + mp2 = ctx.p2().manifest() files |= (set(mp1) | set(mp2)) - set(mc) for f in mc: if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None):