Mercurial > public > mercurial-scm > hg
comparison mercurial/merge.py @ 23319:3177d710630d
merge: drop underscore prefix from _checkunknown()
The method has been called from commands.py since 3eab42088be4
(update: just merge unknown file collisions, 2012-02-09), so drop the
underscore prefix that suggests that it's private.
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 13 Nov 2014 23:12:15 -0800 |
| parents | ff93aa006e6a |
| children | 296b09dcef63 |
comparison
equal
deleted
inserted
replaced
| 23318:fc73293f6060 | 23319:3177d710630d |
|---|---|
| 302 and os.path.isfile(repo.wjoin(f)) | 302 and os.path.isfile(repo.wjoin(f)) |
| 303 and repo.wopener.audit.check(f) | 303 and repo.wopener.audit.check(f) |
| 304 and repo.dirstate.normalize(f) not in repo.dirstate | 304 and repo.dirstate.normalize(f) not in repo.dirstate |
| 305 and mctx[f].cmp(wctx[f])) | 305 and mctx[f].cmp(wctx[f])) |
| 306 | 306 |
| 307 def _checkunknown(repo, wctx, mctx): | 307 def checkunknown(repo, wctx, mctx): |
| 308 "check for collisions between unknown files and files in mctx" | 308 "check for collisions between unknown files and files in mctx" |
| 309 | 309 |
| 310 error = False | 310 error = False |
| 311 for f in mctx: | 311 for f in mctx: |
| 312 if f not in wctx and _checkunknownfile(repo, wctx, mctx, f): | 312 if f not in wctx and _checkunknownfile(repo, wctx, mctx, f): |