[Request] [- ] D11504: dirstate: stop checking for path collision when adjusting parents

SimonSapin phabricator at mercurial-scm.org
Tue Sep 28 19:54:52 UTC 2021


SimonSapin created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  This was already checked at a earlier point when adding the file.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/dirstate.py

CHANGE DETAILS

diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -408,7 +408,6 @@
                     source = self._map.copymap.get(f)
                     if source:
                         copies[f] = source
-                    self._check_new_tracked_filename(f)
                     self._map.reset_state(
                         f,
                         p1_tracked=False,



To: SimonSapin, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20210928/c1c0820e/attachment.html>


More information about the Mercurial-patches mailing list