Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker
authorMatt Harbison <matt_harbison@yahoo.com>
Thu, 22 Mar 2018 22:58:31 -0400
changeset 37087 e4640ec346ac
parent 37086 658b1d28813c
child 37088 08890706366e
merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker Per the docstring for dirstate.normalize().
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Thu Mar 22 22:56:29 2018 -0400
+++ b/mercurial/merge.py	Thu Mar 22 22:58:31 2018 -0400
@@ -707,7 +707,7 @@
             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
mercurial