# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 2018-04-27 05:28:56
# Node ID d4aad0dd69edf0215c9566b9ce7a18386e3917ce
# Parent  73ca1c5e65f8f2899f973a8185f25ca30e8d5806

cvsps: wrap bytes in bytestr before %r-ing it

Differential Revision: https://phab.mercurial-scm.org/D3487

diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py
+++ b/hgext/convert/cvsps.py
@@ -798,7 +798,7 @@ def createchangeset(ui, log, fuzz=60, me
                 except KeyError:
                     ui.warn(_("warning: CVS commit message references "
                               "non-existent branch %r:\n%s\n")
-                            % (m, c.comment))
+                            % (pycompat.bytestr(m), c.comment))
                 if m in branches and c.branch != m and not candidate.synthetic:
                     c.parents.append(candidate)