D779: merge: add _checkunknowndirs function for detecting path conflicts
ryanmce (Ryan McElroy)
phabricator at mercurial-scm.org
Mon Sep 25 15:59:01 EDT 2017
ryanmce added inline comments.
INLINE COMMENTS
> merge.py:654
> + for p in reversed(list(util.finddirs(f))):
> + if (repo.wvfs.audit.check(p)
> + and repo.wvfs.isfileorlink(p)
Why do we need to audit this path first? If we fail the audit, what happens? This looks weird to me.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D779
To: mbthomas, #hg-reviewers
Cc: ryanmce, mercurial-devel
More information about the Mercurial-devel
mailing list