mercurial/scmutil.py

--- a/mercurial/scmutil.py	Fri Nov 01 17:38:07 2019 +0100
+++ b/mercurial/scmutil.py	Fri Nov 01 17:35:36 2019 +0100
@@ -1854,7 +1854,7 @@
                 raise error.CorruptedState(e % self.firstlinekey)
             d.update(updatedict)
         except ValueError as e:
-            raise error.CorruptedState(str(e))
+            raise error.CorruptedState(stringutil.forcebytestr(e))
         return d
 
     def write(self, data, firstline=None):