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

[durin42 (Augie Fackler)]

durin42 added inline comments.
durin42 marked 2 inline comments as done.

INLINE COMMENTS

> martinvonz wrote in histedit.py:1975-1978
> Does `None` (the default value for that argument) work? It seems like it should. If it does, then that seems preferable.

No, because that gives me the workingctx, and I need p1 of the workingctx. Again, I figured that out by printf debugging powers, it wasn't what I would have guessed (I actually expected `[c]` to be the right argument to `calculateupdates` - but the check didn't do what I needed until I was getting p1 of the workingctx like this. Sigh.)

> martinvonz wrote in histedit.py:1987-1988
> They all seem right to me. I don't think `followcopies` should make a difference for untracked/ignored files.

Agreed. I'm just not wanting to provide a warranty that this makes sense in the future, thus the hedging.

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