D6882: histedit: sniff-test for untracked file conflicts before prompting for rules

[martinvonz (Martin von Zweigbergk)]

martinvonz added inline comments.

INLINE COMMENTS

> histedit.py:1975-1978
> +    # 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.

> histedit.py:1987-1988
> +                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.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6882/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6882

To: durin42, #hg-reviewers
Cc: martinvonz, mercurial-devel