equal
deleted
inserted
replaced
496 def updatebookmarks(repo, nstate, originalbookmarks, **opts): |
496 def updatebookmarks(repo, nstate, originalbookmarks, **opts): |
497 'Move bookmarks to their correct changesets' |
497 'Move bookmarks to their correct changesets' |
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: |
501 # update the bookmarks for revs that have moved |
502 # update the bookmarks for revs that have moved |
502 marks[k] = nstate[v] |
503 marks[k] = nstate[v] |
|
504 |
503 |
505 marks.write() |
504 marks.write() |
506 |
505 |
507 def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches, |
506 def storestatus(repo, originalwd, target, state, collapse, keep, keepbranches, |
508 external): |
507 external): |