py3: convert an exception message to bytes
One of our users ran into this (unrelated to my recent work on
more specific errors).
Differential Revision: https://phab.mercurial-scm.org/D9184
--- a/mercurial/merge.py Fri Oct 09 08:08:54 2020 -0700
+++ b/mercurial/merge.py Fri Oct 09 09:17:47 2020 -0700
@@ -1309,7 +1309,8 @@
wctx[f].remove(ignoremissing=True)
except OSError as inst:
repo.ui.warn(
- _(b"update failed to remove %s: %s!\n") % (f, inst.strerror)
+ _(b"update failed to remove %s: %s!\n")
+ % (f, pycompat.bytestr(inst.strerror))
)
if i == 100:
yield i, f