# HG changeset patch # User Pierre-Yves David # Date 2021-07-19 02:43:28 # Node ID ff481c23849691313de6140e558301939470d036 # Parent f98145ce78d785fdcff4803a5f8b2ce267b932a8 dirstate: properly update `_lastnormaltime` in `update_file_p1` This was previously overlooked. Differential Revision: https://phab.mercurial-scm.org/D11138 diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -552,6 +552,14 @@ class dirstate(object): possibly_dirty=possibly_dirty, 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] @requires_parents_change def update_file(