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

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Wed Sep 25 18:34:19 UTC 2019


durin42 added inline comments.

INLINE COMMENTS

> martinvonz wrote in histedit.py:1974-1993
> Won't they (correctly) cause a conflict with your approach too?

They'll correctly cause a conflict, but I trust the merge code to efficiently figure out what paths to look up, rather than (eg) enumerating a large build/ hierarchy that's wholly ignored.

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


More information about the Mercurial-devel mailing list