D6882: histedit: sniff-test for untracked file conflicts before prompting for rules
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Wed Sep 25 17:04:53 EDT 2019
martinvonz added inline comments.
> + # Please don't ask me why `ancestors` is this value. I figured it
> + # out with print-debugging, not by actually understanding what the
> + # merge code is doing. :(
> + ancs = [repo['.']]
Does `None` (the default value for that argument) work? It seems like it should. If it does, then that seems preferable.
> + repo, wctx, c, ancs,
> + # These parameters were determined by print-debugging
> + # what happens later on inside histedit.
> + False, # branchmerge
They all seem right to me. I don't think `followcopies` should make a difference for untracked/ignored files.
CHANGES SINCE LAST ACTION
To: durin42, #hg-reviewers
Cc: martinvonz, mercurial-devel
More information about the Mercurial-devel