mercurial/pure/parsers.py
changeset 48060 a660d8a53267
parent 47990 0d2a404f1932
child 48061 060cd909439f
equal deleted inserted replaced
48059:5d68c4eedd66 48060:a660d8a53267
   261         self._wc_tracked = False
   261         self._wc_tracked = False
   262         self._mode = None
   262         self._mode = None
   263         self._size = None
   263         self._size = None
   264         self._mtime = None
   264         self._mtime = None
   265 
   265 
       
   266     def drop_merge_data(self):
       
   267         """remove all "merge-only" from a DirstateItem
       
   268 
       
   269         This is to be call by the dirstatemap code when the second parent is dropped
       
   270         """
       
   271         if not (self.merged or self.from_p2):
       
   272             return
       
   273         self._p1_tracked = self.merged  # why is this not already properly set ?
       
   274 
       
   275         self._merged = False
       
   276         self._clean_p1 = False
       
   277         self._clean_p2 = False
       
   278         self._p2_tracked = False
       
   279         self._possibly_dirty = True
       
   280         self._mode = None
       
   281         self._size = None
       
   282         self._mtime = None
       
   283 
   266     @property
   284     @property
   267     def mode(self):
   285     def mode(self):
   268         return self.v1_mode()
   286         return self.v1_mode()
   269 
   287 
   270     @property
   288     @property