changeset 4102:3895f6fcd35c stable

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.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 13 Sep 2018 19:09:48 +0200
parents 88000f1d2406
children 1c0a09668709
files hgext3rd/evolve/firstmergecache.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)