mercurial/narrowspec.py
changeset 44856 b7808443ed6a
parent 44563 1922694d638f
child 45334 b9b055f15035
--- 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):