firstmergecache: update the variable tracking on-disk state after write stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 13 Sep 2018 19:09:48 +0200
branchstable
changeset 4102 3895f6fcd35c
parent 4101 88000f1d2406
child 4103 1c0a09668709
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.
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)