Show More
@@ -1764,6 +1764,8 b' def clearrebased(ui, repo, destmap, stat' | |||
|
1764 | 1764 | replacements = {} |
|
1765 | 1765 | moves = {} |
|
1766 | 1766 | stripcleanup = not obsolete.isenabled(repo, obsolete.createmarkersopt) |
|
1767 | ||
|
1768 | collapsednodes = [] | |
|
1767 | 1769 | for rev, newrev in sorted(state.items()): |
|
1768 | 1770 | if newrev >= 0 and newrev != rev: |
|
1769 | 1771 | oldnode = tonode(rev) |
@@ -1774,10 +1776,14 b' def clearrebased(ui, repo, destmap, stat' | |||
|
1774 | 1776 | if rev in skipped: |
|
1775 | 1777 | if stripcleanup or not repo[rev].obsolete(): |
|
1776 | 1778 | succs = () |
|
1779 | elif collapsedas: | |
|
1780 | collapsednodes.append(oldnode) | |
|
1777 | 1781 | else: |
|
1778 | 1782 | succs = (newnode,) |
|
1779 | 1783 | if succs is not None: |
|
1780 | 1784 | replacements[(oldnode,)] = succs |
|
1785 | if collapsednodes: | |
|
1786 | replacements[tuple(collapsednodes)] = (collapsedas,) | |
|
1781 | 1787 | scmutil.cleanupnodes(repo, replacements, 'rebase', moves, backup=backup) |
|
1782 | 1788 | if fm: |
|
1783 | 1789 | hf = fm.hexfunc |
General Comments 0
You need to be logged in to leave comments.
Login now