Show More
@@ -498,9 +498,8 b' def updatebookmarks(repo, nstate, origin' | |||
|
498 | 498 | marks = repo._bookmarks |
|
499 | 499 | for k, v in originalbookmarks.iteritems(): |
|
500 | 500 | if v in nstate: |
|
501 | if nstate[v] > nullmerge: | |
|
502 | # update the bookmarks for revs that have moved | |
|
503 | marks[k] = nstate[v] | |
|
501 | # update the bookmarks for revs that have moved | |
|
502 | marks[k] = nstate[v] | |
|
504 | 503 | |
|
505 | 504 | marks.write() |
|
506 | 505 |
General Comments 0
You need to be logged in to leave comments.
Login now