D6882: histedit: sniff-test for untracked file conflicts before prompting for rules
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Sep 25 14:39:08 EDT 2019
martinvonz added inline comments.
> durin42 wrote in histedit.py:1974-1993
> They'll correctly cause a conflict, but I trust the merge code to efficiently figure out what paths to look up, rather than (eg) enumerating a large build/ hierarchy that's wholly ignored.
Ah, now I see what you mean. There are also config options for `merge.checkunknown`, `merge.checkignored`, and `experimental.merge.checkpathconflicts` (and maybe others) that my proposal would miss. So I agree with doing it the way you have.
CHANGES SINCE LAST ACTION
To: durin42, #hg-reviewers
Cc: martinvonz, mercurial-devel
More information about the Mercurial-devel