equal
deleted
inserted
replaced
596 return config |
596 return config |
597 |
597 |
598 def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
598 def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
599 if f2 is None: |
599 if f2 is None: |
600 f2 = f |
600 f2 = f |
601 return (repo.wvfs.isfileorlink(f) |
601 return (repo.wvfs.audit.check(f) |
602 and repo.wvfs.audit.check(f) |
602 and repo.wvfs.isfileorlink(f) |
603 and repo.dirstate.normalize(f) not in repo.dirstate |
603 and repo.dirstate.normalize(f) not in repo.dirstate |
604 and mctx[f2].cmp(wctx[f])) |
604 and mctx[f2].cmp(wctx[f])) |
605 |
605 |
606 def _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce): |
606 def _checkunknownfiles(repo, wctx, mctx, force, actions, mergeforce): |
607 """ |
607 """ |