Mercurial > hg

changeset 30226:264f00b3e5f0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with i18n
author Kevin Bullock <kbullock+mercurial@ringworld.org>
date Mon, 24 Oct 2016 09:14:34 -0500
parents ad56071b37d4 (diff) 7069d3d8a56e (current diff)
children 5ee944b9c750
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Sat Oct 22 23:18:43 2016 -0200
+++ b/mercurial/dirstate.py	Mon Oct 24 09:14:34 2016 -0500
@@ -757,6 +757,7 @@
                     start = int(clock) - (int(clock) % delaywrite)
                     end = start + delaywrite
                     time.sleep(end - clock)
+                    now = end # trust our estimate that the end is near now
                     break
 
         st.write(parsers.pack_dirstate(self._map, self._copymap, self._pl, now))