mercurial/merge.py
changeset 29216 ead25aa27a43
parent 29148 899879becd65
child 29242 4d075bf28702
equal deleted inserted replaced
29215:f5983805574e 29216:ead25aa27a43
   371 
   371 
   372     def _writerecordsv1(self, records):
   372     def _writerecordsv1(self, records):
   373         """Write current state on disk in a version 1 file"""
   373         """Write current state on disk in a version 1 file"""
   374         f = self._repo.vfs(self.statepathv1, 'w')
   374         f = self._repo.vfs(self.statepathv1, 'w')
   375         irecords = iter(records)
   375         irecords = iter(records)
   376         lrecords = irecords.next()
   376         lrecords = next(irecords)
   377         assert lrecords[0] == 'L'
   377         assert lrecords[0] == 'L'
   378         f.write(hex(self._local) + '\n')
   378         f.write(hex(self._local) + '\n')
   379         for rtype, data in irecords:
   379         for rtype, data in irecords:
   380             if rtype == 'F':
   380             if rtype == 'F':
   381                 f.write('%s\n' % _droponode(data))
   381                 f.write('%s\n' % _droponode(data))