Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 29216 ead25aa27a43
parent 29148 899879becd65
child 29242 4d075bf28702 
--- a/mercurial/merge.py	Mon May 16 21:30:32 2016 +0000
+++ b/mercurial/merge.py	Mon May 16 21:30:53 2016 +0000
@@ -373,7 +373,7 @@
         """Write current state on disk in a version 1 file"""
         f = self._repo.vfs(self.statepathv1, 'w')
         irecords = iter(records)
-        lrecords = irecords.next()
+        lrecords = next(irecords)
         assert lrecords[0] == 'L'
         f.write(hex(self._local) + '\n')
         for rtype, data in irecords:
mercurial