##// END OF EJS Templates
dirstate: replace the use of _normallookup in `setparents`...
marmoute -
r48805:625b84c1 default
parent child Browse files
Show More
@@ -401,7 +401,12 b' class dirstate(object):'
401 source = self._map.copymap.get(f)
401 source = self._map.copymap.get(f)
402 if source:
402 if source:
403 copies[f] = source
403 copies[f] = source
404 self._normallookup(f)
404 self._map.reset_state(
405 f,
406 wc_tracked=True,
407 p1_tracked=True,
408 possibly_dirty=True,
409 )
405 # Also fix up otherparent markers
410 # Also fix up otherparent markers
406 elif s.from_p2:
411 elif s.from_p2:
407 source = self._map.copymap.get(f)
412 source = self._map.copymap.get(f)
General Comments 0
You need to be logged in to leave comments. Login now