diff -r 1d2d353e5c4a -r b7808443ed6a mercurial/narrowspec.py --- a/mercurial/narrowspec.py Mon May 18 12:45:45 2020 -0400 +++ b/mercurial/narrowspec.py Mon May 18 14:59:59 2020 -0400 @@ -14,6 +14,7 @@ error, match as matchmod, merge, + mergestate as mergestatemod, scmutil, sparse, util, @@ -272,7 +273,7 @@ def _writeaddedfiles(repo, pctx, files): actions = merge.emptyactions() - addgaction = actions[merge.ACTION_GET].append + addgaction = actions[mergestatemod.ACTION_GET].append mf = repo[b'.'].manifest() for f in files: if not repo.wvfs.exists(f):