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:21:01 EDT 2019
martinvonz added inline comments.
> durin42 wrote in histedit.py:1975-1978
> 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.)
Oh, I confused `calculateupdates()` arguments with `update()` -- `calculateupdates()` does not calculate a default ancestor, so you have to pass it in as you do here.
CHANGES SINCE LAST ACTION
To: durin42, #hg-reviewers
Cc: martinvonz, mercurial-devel
More information about the Mercurial-devel