##// END OF EJS Templates
dirstatemap: use the default code to handle "removed" case...
marmoute -
r48713:4cade5e9 default
parent child Browse files
Show More
@@ -274,12 +274,7 b' class dirstatemap(object):'
274 self.addfile(filename, added=True, possibly_dirty=possibly_dirty)
274 self.addfile(filename, added=True, possibly_dirty=possibly_dirty)
275 return
275 return
276 elif (p1_tracked or p2_tracked) and not wc_tracked:
276 elif (p1_tracked or p2_tracked) and not wc_tracked:
277 # XXX might be merged and removed ?
277 pass
278 old_entry = self._map.get(filename)
279 self._dirs_decr(filename, old_entry=old_entry, remove_variant=True)
280 self._map[filename] = DirstateItem.from_v1_data(b'r', 0, 0, 0)
281 self.nonnormalset.add(filename)
282 return
283 elif clean_p2 and wc_tracked:
278 elif clean_p2 and wc_tracked:
284 if p1_tracked or self.get(filename) is not None:
279 if p1_tracked or self.get(filename) is not None:
285 # XXX the `self.get` call is catching some case in
280 # XXX the `self.get` call is catching some case in
General Comments 0
You need to be logged in to leave comments. Login now