# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2018-03-23 02:58:31
# Node ID e4640ec346ac34a9c818c6ee5db1e623b0ad5b47
# Parent  658b1d28813cc46c269d34595c153b39d13a9583

merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker

Per the docstring for dirstate.normalize().

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -707,7 +707,7 @@ class _unknowndirschecker(object):
             for p, dirs, files in repo.wvfs.walk(f):
                 for fn in files:
                     relf = util.pconvert(repo.wvfs.reljoin(p, fn))
-                    relf = repo.dirstate.normalize(relf)
+                    relf = repo.dirstate.normalize(relf, isknown=True)
                     if relf not in repo.dirstate:
                         return f
         return None