changeset 42456 | 87a34c767384 |
parent 42411 | 4738c292a520 |
child 42813 | 268662aac075 |
--- a/mercurial/narrowspec.py Wed Jun 12 13:10:52 2019 -0400 +++ b/mercurial/narrowspec.py Mon May 27 16:55:46 2019 -0400 @@ -259,7 +259,7 @@ if not repo.wvfs.exists(f): addgaction((f, (mf.flags(f), False), "narrowspec updated")) merge.applyupdates(repo, actions, wctx=repo[None], - mctx=repo['.'], overwrite=False) + mctx=repo['.'], overwrite=False, wantfiledata=False) def checkworkingcopynarrowspec(repo): # Avoid infinite recursion when updating the working copy