branch | stable |
changeset 43723 | eab0b7383cd3 |
parent 43166 | a5b04863dbff |
child 43735 | 7eb701e355bd |
--- a/mercurial/patch.py Wed Nov 20 08:11:21 2019 -0800 +++ b/mercurial/patch.py Thu Nov 21 14:28:28 2019 -0500 @@ -2290,7 +2290,7 @@ try: current_file = patcher(ui, gp, backend, store, eolmode=eolmode) except PatchError as inst: - ui.warn(str(inst) + b'\n') + ui.warn(stringutil.forcebytestr(inst) + b'\n') current_file = None rejects += 1 continue