--- a/contrib/python3-whitelist	Sat Jun 16 17:54:29 2018 +0900
+++ b/contrib/python3-whitelist	Sat Jun 16 17:56:37 2018 +0900
@@ -127,6 +127,7 @@
 test-eol-tag.t
 test-eol-update.t
 test-eol.t
+test-eolfilename.t
 test-excessive-merge.t
 test-exchange-obsmarkers-case-A1.t
 test-exchange-obsmarkers-case-A2.t

--- 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

--- a/mercurial/scmutil.py	Sat Jun 16 17:54:29 2018 +0900
+++ b/mercurial/scmutil.py	Sat Jun 16 17:56:37 2018 +0900
@@ -287,7 +287,8 @@
 def checkfilename(f):
     '''Check that the filename f is an acceptable filename for a tracked file'''
     if '\r' in f or '\n' in f:
-        raise error.Abort(_("'\\n' and '\\r' disallowed in filenames: %r") % f)
+        raise error.Abort(_("'\\n' and '\\r' disallowed in filenames: %r")
+                          % pycompat.bytestr(f))
 
 def checkportable(ui, f):
     '''Check if filename f is portable and warn or abort depending on config'''