# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 2021-07-16 15:23:40
# Node ID 4cade5e944c2d932f3fa24cd0a9fc8e9e68487e1
# Parent  3429f48d486d520f9d783ff1e17ef24f9bcc6de5

dirstatemap: use the default code to handle "removed" case

This one is very easy.

Differential Revision: https://phab.mercurial-scm.org/D11327

diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py
--- a/mercurial/dirstatemap.py
+++ b/mercurial/dirstatemap.py
@@ -274,12 +274,7 @@ class dirstatemap(object):
             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