branch | stable |
changeset 23980 | c1ce5442453f |
parent 23139 | e53f6b72a0e4 |
child 23982 | 751d1138ce35 |
--- a/mercurial/copies.py Fri Jan 30 14:39:03 2015 +0000 +++ b/mercurial/copies.py Fri Jan 30 16:02:28 2015 +0000 @@ -170,8 +170,11 @@ missing = set(b.manifest().iterkeys()) missing.difference_update(a.manifest().iterkeys()) + ancestrycontext = a._repo.changelog.ancestors([b.rev()], inclusive=True) for f in missing: - ofctx = _tracefile(b[f], am, limit) + fctx = b[f] + fctx._ancestrycontext = ancestrycontext + ofctx = _tracefile(fctx, am, limit) if ofctx: cm[f] = ofctx.path()