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