equal
deleted
inserted
replaced
638 |
638 |
639 if not keep: |
639 if not keep: |
640 if mapping: |
640 if mapping: |
641 movebookmarks(ui, repo, mapping, topmost, ntm) |
641 movebookmarks(ui, repo, mapping, topmost, ntm) |
642 # TODO update mq state |
642 # TODO update mq state |
643 if obsolete._enabled: |
643 if obsolete.isenabled(repo, obsolete.createmarkersopt): |
644 markers = [] |
644 markers = [] |
645 # sort by revision number because it sound "right" |
645 # sort by revision number because it sound "right" |
646 for prec in sorted(mapping, key=repo.changelog.rev): |
646 for prec in sorted(mapping, key=repo.changelog.rev): |
647 succs = mapping[prec] |
647 succs = mapping[prec] |
648 markers.append((repo[prec], |
648 markers.append((repo[prec], |