mercurial/merge.py
changeset 23479 406dfc63a1ad
parent 23476 39a12719ec65
parent 23478 30b602168c3b
child 23482 208ec8ca7c79
equal deleted inserted replaced
23476:39a12719ec65 23479:406dfc63a1ad
   296         elif not r:
   296         elif not r:
   297             self.mark(dfile, 'r')
   297             self.mark(dfile, 'r')
   298         return r
   298         return r
   299 
   299 
   300 def _checkunknownfile(repo, wctx, mctx, f):
   300 def _checkunknownfile(repo, wctx, mctx, f):
   301     return (not repo.dirstate._ignore(f)
   301     return (os.path.isfile(repo.wjoin(f))
   302         and os.path.isfile(repo.wjoin(f))
       
   303         and repo.wopener.audit.check(f)
   302         and repo.wopener.audit.check(f)
   304         and repo.dirstate.normalize(f) not in repo.dirstate
   303         and repo.dirstate.normalize(f) not in repo.dirstate
   305         and mctx[f].cmp(wctx[f]))
   304         and mctx[f].cmp(wctx[f]))
   306 
   305 
   307 def _forgetremoved(wctx, mctx, branchmerge):
   306 def _forgetremoved(wctx, mctx, branchmerge):