Mercurial > hg

changeset 45688:ed0ded64a8a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 09 Oct 2020 09:17:47 -0700
parents 223296268c4e
children ef8eccefe0c3
files mercurial/merge.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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