martinvonz added inline comments. INLINE COMMENTS
> histedit.py:1974-1993 > + wctx = repo[None] > + # 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['.']] > + # Sniff-test to make sure we won't collide with untracked files in > + # the working directory. If we don't do this, we can get a Would it be enough to check if any untracked file is in any of those commits? That should be a lot simpler and cheaper. 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 _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
