Mercurial > public > mercurial-scm > hg

diff mercurial/patch.py @ 43735:7eb701e355bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Fri, 22 Nov 2019 21:42:04 +0900
parents d649de29f1ff eab0b7383cd3
children be8552f25cab
line wrap: on
line diff
--- a/mercurial/patch.py	Thu Nov 21 15:46:35 2019 -0500
+++ b/mercurial/patch.py	Fri Nov 22 21:42:04 2019 +0900
@@ -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