equal
deleted
inserted
replaced
276 self._size = None |
276 self._size = None |
277 self._mtime_s = None |
277 self._mtime_s = None |
278 self._mtime_ns = None |
278 self._mtime_ns = None |
279 |
279 |
280 def drop_merge_data(self): |
280 def drop_merge_data(self): |
281 """remove all "merge-only" from a DirstateItem |
281 """remove all "merge-only" information from a DirstateItem |
282 |
282 |
283 This is to be call by the dirstatemap code when the second parent is dropped |
283 This is to be call by the dirstatemap code when the second parent is dropped |
284 """ |
284 """ |
285 if self._p2_info: |
285 if self._p2_info: |
286 self._p2_info = False |
286 self._p2_info = False |