Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: make sure we write in mergestate in bytes mode
authorPulkit Goyal <7895pulkit@gmail.com>
Wed, 28 Feb 2018 21:44:28 +0530
changeset 36507 035b77bf01d2
parent 36506 263368dc143f
child 36508 a6e9a360ccd8
py3: make sure we write in mergestate in bytes mode Differential Revision: https://phab.mercurial-scm.org/D2501
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Wed Feb 28 21:43:35 2018 +0530
+++ b/mercurial/merge.py	Wed Feb 28 21:44:28 2018 +0530
@@ -399,7 +399,7 @@
 
     def _writerecordsv1(self, records):
         """Write current state on disk in a version 1 file"""
-        f = self._repo.vfs(self.statepathv1, 'w')
+        f = self._repo.vfs(self.statepathv1, 'wb')
         irecords = iter(records)
         lrecords = next(irecords)
         assert lrecords[0] == 'L'
@@ -415,7 +415,7 @@
         See the docstring for _readrecordsv2 for why we use 't'."""
         # these are the records that all version 2 clients can read
         whitelist = 'LOF'
-        f = self._repo.vfs(self.statepathv2, 'w')
+        f = self._repo.vfs(self.statepathv2, 'wb')
         for key, data in records:
             assert len(key) == 1
             if key not in whitelist:
hg-stable