# HG changeset patch # User Pierre-Yves David # Date 1408976324 -7200 # Node ID 5bf18f8ca89d4b1278889355c7069d678dc6ff72 # Parent 13e22358e9d20461e97b570362f05ce2e438070e obsstore: store and preserve ondisk version diff -r 13e22358e9d2 -r 5bf18f8ca89d mercurial/obsolete.py --- a/mercurial/obsolete.py Mon Aug 25 16:51:51 2014 +0200 +++ b/mercurial/obsolete.py Mon Aug 25 16:18:44 2014 +0200 @@ -311,8 +311,9 @@ self.children = {} self.sopener = sopener data = sopener.tryread('obsstore') + self._version = _fm0version if data: - version, markers = _readmarkers(data) + self._version, markers = _readmarkers(data) self._load(markers) def __iter__(self): @@ -382,7 +383,7 @@ offset = f.tell() transaction.add('obsstore', offset) # offset == 0: new file - add the version header - for bytes in _encodemarkers(new, offset == 0): + for bytes in _encodemarkers(new, offset == 0, self._version): f.write(bytes) finally: # XXX: f.close() == filecache invalidation == obsstore rebuilt.