Show More
@@ -750,6 +750,7 b' def _histedit(ui, repo, state, *freeargs' | |||||
750 |
|
750 | |||
751 | replacements = [] |
|
751 | replacements = [] | |
752 | state.keep = opts.get('keep', False) |
|
752 | state.keep = opts.get('keep', False) | |
|
753 | supportsmarkers = obsolete.isenabled(repo, obsolete.createmarkersopt) | |||
753 |
|
754 | |||
754 | # rebuild state |
|
755 | # rebuild state | |
755 | if goal == 'continue': |
|
756 | if goal == 'continue': | |
@@ -881,7 +882,7 b' def _histedit(ui, repo, state, *freeargs' | |||||
881 | if mapping: |
|
882 | if mapping: | |
882 | movebookmarks(ui, repo, mapping, state.topmost, ntm) |
|
883 | movebookmarks(ui, repo, mapping, state.topmost, ntm) | |
883 | # TODO update mq state |
|
884 | # TODO update mq state | |
884 | if obsolete.isenabled(repo, obsolete.createmarkersopt): |
|
885 | if supportsmarkers: | |
885 | markers = [] |
|
886 | markers = [] | |
886 | # sort by revision number because it sound "right" |
|
887 | # sort by revision number because it sound "right" | |
887 | for prec in sorted(mapping, key=repo.changelog.rev): |
|
888 | for prec in sorted(mapping, key=repo.changelog.rev): |
General Comments 0
You need to be logged in to leave comments.
Login now