This is an archive of the discontinued Mercurial Phabricator instance.

	# up. Otherwise, look to see if there is a file that conflicts			# up. Otherwise, look to see if there is a file that conflicts
	# with a directory this file is in, and if so, back that up.			# with a directory this file is in, and if so, back that up.
	absf = repo.wjoin(f)			absf = repo.wjoin(f)
	if not repo.wvfs.lexists(f):			if not repo.wvfs.lexists(f):
	for p in util.finddirs(f):			for p in util.finddirs(f):
	if repo.wvfs.isfileorlink(p):			if repo.wvfs.isfileorlink(p):
	absf = repo.wjoin(p)			absf = repo.wjoin(p)
	break			break
	orig = scmutil.origpath(ui, repo, absf)
	if repo.wvfs.lexists(absf):			if repo.wvfs.lexists(absf):
				orig = scmutil.origpath(ui, repo, absf)
	util.rename(absf, orig)			util.rename(absf, orig)
	wctx[f].clearunknown()			wctx[f].clearunknown()
	atomictemp = ui.configbool("experimental", "update.atomic-file")			atomictemp = ui.configbool("experimental", "update.atomic-file")
	wctx[f].write(fctx(f).data(), flags, backgroundclose=True,			wctx[f].write(fctx(f).data(), flags, backgroundclose=True,
	atomictemp=atomictemp)			atomictemp=atomictemp)
	if i == 100:			if i == 100:
	yield i, f			yield i, f
	i = 0			i = 0

merge: don't unnecessarily calculate backup pathClosedPublic