# HG changeset patch # User Pierre-Yves David # Date 1536858588 -7200 # Node ID 3895f6fcd35c177246d0a49294687422fa9cba8c # Parent 88000f1d24069bef890f152f3c265a6dc614d5cd firstmergecache: update the variable tracking on-disk state after write Since we updated the on disk content, we should update that value. In practice the object will likely be discarded after the write, but there is nothing wrong in being more correct. diff -r 88000f1d2406 -r 3895f6fcd35c hgext3rd/evolve/firstmergecache.py --- a/hgext3rd/evolve/firstmergecache.py Thu Sep 13 17:08:18 2018 +0200 +++ b/hgext3rd/evolve/firstmergecache.py Thu Sep 13 19:09:48 2018 +0200 @@ -142,5 +142,6 @@ cachefile.write(headerdata) cachefile.write(self._data.tostring()) cachefile.close() + self._ondiskkey = self._cachekey except (IOError, OSError) as exc: repo.ui.debug('firstmergecache: could not write update %s\n' % exc)