##// END OF EJS Templates
bookmarks: avoid deleting primary bookmarks on rebase...
Matt Mackall -
r21843:92666a86 stable
parent child Browse files
Show More
@@ -164,6 +164,9 b' def deletedivergent(repo, deletefrom, bm'
164 marks = repo._bookmarks
164 marks = repo._bookmarks
165 divergent = [b for b in marks if b.split('@', 1)[0] == bm.split('@', 1)[0]]
165 divergent = [b for b in marks if b.split('@', 1)[0] == bm.split('@', 1)[0]]
166 for mark in divergent:
166 for mark in divergent:
167 if mark == '@' or '@' not in mark:
168 # can't be divergent by definition
169 continue
167 if mark and marks[mark] in deletefrom:
170 if mark and marks[mark] in deletefrom:
168 if mark != bm:
171 if mark != bm:
169 del marks[mark]
172 del marks[mark]
General Comments 0
You need to be logged in to leave comments. Login now