Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: stop checking for path collision when adjusting parents
authorPierre-Yves David <pierre-yves.david@octobus.net>
Wed, 22 Sep 2021 09:46:37 +0200
changeset 48073 40dd56086056
parent 48072 62188e4de549
child 48074 5d68c4eedd66
dirstate: stop checking for path collision when adjusting parents This was already checked at a earlier point when adding the file. Differential Revision: https://phab.mercurial-scm.org/D11504
mercurial/dirstate.py file | annotate | diff | comparison | revisions 
--- a/mercurial/dirstate.py	Wed Sep 22 15:08:47 2021 +0200
+++ b/mercurial/dirstate.py	Wed Sep 22 09:46:37 2021 +0200
@@ -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,
hg-stable