Mercurial > hg
comparison hgext/largefiles/overrides.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 | 9dd0d0d61a24 |
children | 19ebd2f88fc7 |
comparison
equal
deleted
inserted
replaced
23318:fc73293f6060 | 23319:3177d710630d |
---|---|
370 return orig(ui, repo, *pats, **opts) | 370 return orig(ui, repo, *pats, **opts) |
371 finally: | 371 finally: |
372 wlock.release() | 372 wlock.release() |
373 | 373 |
374 # Before starting the manifest merge, merge.updates will call | 374 # Before starting the manifest merge, merge.updates will call |
375 # _checkunknown to check if there are any files in the merged-in | 375 # checkunknown to check if there are any files in the merged-in |
376 # changeset that collide with unknown files in the working copy. | 376 # changeset that collide with unknown files in the working copy. |
377 # | 377 # |
378 # The largefiles are seen as unknown, so this prevents us from merging | 378 # The largefiles are seen as unknown, so this prevents us from merging |
379 # in a file 'foo' if we already have a largefile with the same name. | 379 # in a file 'foo' if we already have a largefile with the same name. |
380 # | 380 # |