Patchwork D11504: dirstate: stop checking for path collision when adjusting parents

login
register
mail settings
Submitter phabricator
Date Sept. 28, 2021, 7:54 p.m.
Message ID <differential-rev-PHID-DREV-2zrfjt5zu3p5tk66wawy-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49827/
State Superseded
Headers show

Comments

phabricator - Sept. 28, 2021, 7:54 p.m.
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




To: SimonSapin, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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,