Show More
@@ -25,6 +25,7 b' test-bookmarks-merge.t' | |||
|
25 | 25 | test-bookmarks-rebase.t |
|
26 | 26 | test-bookmarks-strip.t |
|
27 | 27 | test-bookmarks.t |
|
28 | test-branch-change.t | |
|
28 | 29 | test-branch-option.t |
|
29 | 30 | test-branch-tag-confict.t |
|
30 | 31 | test-branches.t |
@@ -689,7 +689,8 b' def cleanupnodes(repo, replacements, ope' | |||
|
689 | 689 | continue |
|
690 | 690 | from . import bookmarks # avoid import cycle |
|
691 | 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 | 694 | # Delete divergent bookmarks being parents of related newnodes |
|
694 | 695 | deleterevs = repo.revs('parents(roots(%ln & (::%n))) - parents(%n)', |
|
695 | 696 | allnewnodes, newnode, oldnode) |
General Comments 0
You need to be logged in to leave comments.
Login now