##// END OF EJS Templates
py3: drop b'' from debug message "moving bookmarks"
Yuya Nishihara -
r36854:a00c38b3 default
parent child Browse files
Show More
@@ -25,6 +25,7 b' test-bookmarks-merge.t'
25 test-bookmarks-rebase.t
25 test-bookmarks-rebase.t
26 test-bookmarks-strip.t
26 test-bookmarks-strip.t
27 test-bookmarks.t
27 test-bookmarks.t
28 test-branch-change.t
28 test-branch-option.t
29 test-branch-option.t
29 test-branch-tag-confict.t
30 test-branch-tag-confict.t
30 test-branches.t
31 test-branches.t
@@ -689,7 +689,8 b' def cleanupnodes(repo, replacements, ope'
689 continue
689 continue
690 from . import bookmarks # avoid import cycle
690 from . import bookmarks # avoid import cycle
691 repo.ui.debug('moving bookmarks %r from %s to %s\n' %
691 repo.ui.debug('moving bookmarks %r from %s to %s\n' %
692 (oldbmarks, hex(oldnode), hex(newnode)))
692 (util.rapply(pycompat.maybebytestr, oldbmarks),
693 hex(oldnode), hex(newnode)))
693 # Delete divergent bookmarks being parents of related newnodes
694 # Delete divergent bookmarks being parents of related newnodes
694 deleterevs = repo.revs('parents(roots(%ln & (::%n))) - parents(%n)',
695 deleterevs = repo.revs('parents(roots(%ln & (::%n))) - parents(%n)',
695 allnewnodes, newnode, oldnode)
696 allnewnodes, newnode, oldnode)
General Comments 0
You need to be logged in to leave comments. Login now