Mercurial > hg > mercurial-source
changeset 37873:e4640ec346ac
merge: add 'isknown=True' to a dirstate.normalize() in _unknowndirschecker
Per the docstring for dirstate.normalize().
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 22 Mar 2018 22:58:31 -0400 |
parents | 658b1d28813c |
children | 08890706366e |
files | mercurial/merge.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -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