branch | stable |
changeset 46399 | 39f23d20ea47 |
parent 45957 | 89a2afe31e82 |
child 46796 | e2f7b2695ba1 |
--- a/mercurial/merge.py Thu Mar 11 18:09:55 2021 -0500 +++ b/mercurial/merge.py Thu Mar 11 18:33:39 2021 -0500 @@ -20,6 +20,7 @@ nullrev, ) from .thirdparty import attr +from .utils import stringutil from . import ( copies, encoding, @@ -1341,7 +1342,7 @@ except OSError as inst: repo.ui.warn( _(b"update failed to remove %s: %s!\n") - % (f, pycompat.bytestr(inst.strerror)) + % (f, stringutil.forcebytestr(inst.strerror)) ) if i == 100: yield i, f