changeset 23479 | 406dfc63a1ad |
parent 23476 | 39a12719ec65 |
parent 23478 | 30b602168c3b |
child 23482 | 208ec8ca7c79 |
--- a/mercurial/merge.py Wed Dec 03 11:02:52 2014 -0800 +++ b/mercurial/merge.py Fri Dec 05 12:10:56 2014 -0600 @@ -298,8 +298,7 @@ return r def _checkunknownfile(repo, wctx, mctx, f): - return (not repo.dirstate._ignore(f) - and os.path.isfile(repo.wjoin(f)) + return (os.path.isfile(repo.wjoin(f)) and repo.wopener.audit.check(f) and repo.dirstate.normalize(f) not in repo.dirstate and mctx[f].cmp(wctx[f]))