Mercurial > hg
comparison mercurial/merge.py @ 37087: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 | 71543b942eea |
comparison
equal
deleted
inserted
replaced
| 37086:658b1d28813c | 37087:e4640ec346ac |
|---|---|
| 705 if repo.wvfs.audit.check(f) and repo.wvfs.isdir(f): | 705 if repo.wvfs.audit.check(f) and repo.wvfs.isdir(f): |
| 706 # Does the directory contain any files that are not in the dirstate? | 706 # Does the directory contain any files that are not in the dirstate? |
| 707 for p, dirs, files in repo.wvfs.walk(f): | 707 for p, dirs, files in repo.wvfs.walk(f): |
| 708 for fn in files: | 708 for fn in files: |
| 709 relf = util.pconvert(repo.wvfs.reljoin(p, fn)) | 709 relf = util.pconvert(repo.wvfs.reljoin(p, fn)) |
| 710 relf = repo.dirstate.normalize(relf) | 710 relf = repo.dirstate.normalize(relf, isknown=True) |
| 711 if relf not in repo.dirstate: | 711 if relf not in repo.dirstate: |
| 712 return f | 712 return f |
| 713 return None | 713 return None |
| 714 | 714 |
| 715 def _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce): | 715 def _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce): |