Patchwork [2,of,2] merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker

login
register
mail settings
Submitter Matt Harbison
Date March 23, 2018, 3:14 a.m.
Message ID <e4640ec346ac34a9c818.1521774863@Envy>
Download mbox | patch
Permalink /patch/29796/
State Accepted
Headers show

Comments

Matt Harbison - March 23, 2018, 3:14 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1521773911 14400
#      Thu Mar 22 22:58:31 2018 -0400
# Node ID e4640ec346ac34a9c818c6ee5db1e623b0ad5b47
# Parent  658b1d28813cc46c269d34595c153b39d13a9583
merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker

Per the docstring for dirstate.normalize().

Patch

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