# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1520342652 21600
# Node ID a00c38b33047c369b74a2f09b61225635d052c1a
# Parent  5bc7ff103081d16ea7a16e4d0b853c0d18069c30
py3: drop b'' from debug message "moving bookmarks"

diff -r 5bc7ff103081 -r a00c38b33047 contrib/python3-whitelist
--- a/contrib/python3-whitelist	Sat Mar 10 15:57:16 2018 +0900
+++ b/contrib/python3-whitelist	Tue Mar 06 07:24:12 2018 -0600
@@ -25,6 +25,7 @@
 test-bookmarks-rebase.t
 test-bookmarks-strip.t
 test-bookmarks.t
+test-branch-change.t
 test-branch-option.t
 test-branch-tag-confict.t
 test-branches.t
diff -r 5bc7ff103081 -r a00c38b33047 mercurial/scmutil.py
--- a/mercurial/scmutil.py	Sat Mar 10 15:57:16 2018 +0900
+++ b/mercurial/scmutil.py	Tue Mar 06 07:24:12 2018 -0600
@@ -689,7 +689,8 @@
                 continue
             from . import bookmarks # avoid import cycle
             repo.ui.debug('moving bookmarks %r from %s to %s\n' %
-                          (oldbmarks, hex(oldnode), hex(newnode)))
+                          (util.rapply(pycompat.maybebytestr, oldbmarks),
+                           hex(oldnode), hex(newnode)))
             # Delete divergent bookmarks being parents of related newnodes
             deleterevs = repo.revs('parents(roots(%ln & (::%n))) - parents(%n)',
                                    allnewnodes, newnode, oldnode)