Mercurial > hg
comparison mercurial/merge.py @ 27610:b8405d739149
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 02 Jan 2016 02:13:56 +0100 |
| parents | 2e31a17ad1bf 6a6e78f84cc6 |
| children | cc91f3bc5461 |
comparison
equal
deleted
inserted
replaced
| 27609:ca2d4080a02e | 27610:b8405d739149 |
|---|---|
| 557 self._results[f] = 0, 'g' | 557 self._results[f] = 0, 'g' |
| 558 | 558 |
| 559 def _checkunknownfile(repo, wctx, mctx, f, f2=None): | 559 def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
| 560 if f2 is None: | 560 if f2 is None: |
| 561 f2 = f | 561 f2 = f |
| 562 return (os.path.isfile(repo.wjoin(f)) | 562 return (repo.wvfs.isfileorlink(f) |
| 563 and repo.wvfs.audit.check(f) | 563 and repo.wvfs.audit.check(f) |
| 564 and repo.dirstate.normalize(f) not in repo.dirstate | 564 and repo.dirstate.normalize(f) not in repo.dirstate |
| 565 and mctx[f2].cmp(wctx[f])) | 565 and mctx[f2].cmp(wctx[f])) |
| 566 | 566 |
| 567 def _checkunknownfiles(repo, wctx, mctx, force, actions): | 567 def _checkunknownfiles(repo, wctx, mctx, force, actions): |