| Alphare | |
| pulkit |
| hg-reviewers |
This was previously overlooked.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/dirstate.py (8 lines) |
| p1_tracked, | p1_tracked, | ||||
| p2_tracked=p2_tracked, | p2_tracked=p2_tracked, | ||||
| merged=merged, | merged=merged, | ||||
| clean_p1=clean_p1, | clean_p1=clean_p1, | ||||
| clean_p2=clean_p2, | clean_p2=clean_p2, | ||||
| possibly_dirty=possibly_dirty, | possibly_dirty=possibly_dirty, | ||||
| parentfiledata=parentfiledata, | parentfiledata=parentfiledata, | ||||
| ) | ) | ||||
| if ( | |||||
| parentfiledata is not None | |||||
| and parentfiledata[2] > self._lastnormaltime | |||||
| ): | |||||
| # Remember the most recent modification timeslot for status(), | |||||
| # to make sure we won't miss future size-preserving file content | |||||
| # modifications that happen within the same timeslot. | |||||
| self._lastnormaltime = parentfiledata[2] | |||||
| def _addpath( | def _addpath( | ||||
| self, | self, | ||||
| f, | f, | ||||
| mode=0, | mode=0, | ||||
| size=None, | size=None, | ||||
| mtime=None, | mtime=None, | ||||
| added=False, | added=False, | ||||