Mercurial > hg-stable
changeset 47933:4cade5e944c2
dirstatemap: use the default code to handle "removed" case
This one is very easy.
Differential Revision: https://phab.mercurial-scm.org/D11327
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 16 Jul 2021 17:23:40 +0200 |
| parents | 3429f48d486d |
| children | 6816ae362ddd |
| files | mercurial/dirstatemap.py |
| diffstat | 1 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dirstatemap.py Fri Jul 16 17:20:17 2021 +0200 +++ b/mercurial/dirstatemap.py Fri Jul 16 17:23:40 2021 +0200 @@ -274,12 +274,7 @@ self.addfile(filename, added=True, possibly_dirty=possibly_dirty) return elif (p1_tracked or p2_tracked) and not wc_tracked: - # XXX might be merged and removed ? - old_entry = self._map.get(filename) - self._dirs_decr(filename, old_entry=old_entry, remove_variant=True) - self._map[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0) - self.nonnormalset.add(filename) - return + pass elif clean_p2 and wc_tracked: if p1_tracked or self.get(filename) is not None: # XXX the `self.get` call is catching some case in