changeset 38331 | cf59de802883 |
parent 37374 | ac42e39b1b77 |
child 38510 | 561a450c7b64 |
--- a/mercurial/manifest.py Sat Jun 16 17:54:29 2018 +0900 +++ b/mercurial/manifest.py Sat Jun 16 17:56:37 2018 +0900 @@ -20,6 +20,7 @@ error, mdiff, policy, + pycompat, revlog, util, ) @@ -635,7 +636,8 @@ for f in l: if '\n' in f or '\r' in f: raise error.RevlogError( - _("'\\n' and '\\r' disallowed in filenames: %r") % f) + _("'\\n' and '\\r' disallowed in filenames: %r") + % pycompat.bytestr(f)) # apply the changes collected during the bisect loop to our addlist