changeset 41177 | 5838afea8213 |
parent 41176 | 4475322b7533 |
child 41227 | b74481038438 |
--- a/mercurial/narrowspec.py Mon Jan 07 00:37:46 2019 -0800 +++ b/mercurial/narrowspec.py Sun Jan 06 23:37:13 2019 -0800 @@ -251,7 +251,7 @@ def _writeaddedfiles(repo, pctx, files): actions = merge.emptyactions() - addgaction = actions['g'].append + addgaction = actions[merge.ACTION_GET].append mf = repo['.'].manifest() for f in files: if not repo.wvfs.exists(f):