equal
deleted
inserted
replaced
402 return self._resolve(False, dfile, wctx, labels=labels)[1] |
402 return self._resolve(False, dfile, wctx, labels=labels)[1] |
403 |
403 |
404 def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
404 def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
405 if f2 is None: |
405 if f2 is None: |
406 f2 = f |
406 f2 = f |
407 return (os.path.isfile(repo.wjoin(f)) |
407 return (repo.wvfs.isfileorlink(f) |
408 and repo.wvfs.audit.check(f) |
408 and repo.wvfs.audit.check(f) |
409 and repo.dirstate.normalize(f) not in repo.dirstate |
409 and repo.dirstate.normalize(f) not in repo.dirstate |
410 and mctx[f2].cmp(wctx[f])) |
410 and mctx[f2].cmp(wctx[f])) |
411 |
411 |
412 def _checkunknownfiles(repo, wctx, mctx, force, actions): |
412 def _checkunknownfiles(repo, wctx, mctx, force, actions): |