Show More
@@ -656,9 +656,12 b' def buildstate(repo, dest, rebaseset, co' | |||
|
656 | 656 | # |
|
657 | 657 | # The actual abort is handled by `defineparents` |
|
658 | 658 | if len(root.parents()) <= 1: |
|
659 |
# |
|
|
660 | detachset = repo.revs('::%d - ::%d - %d', root, commonbase, root) | |
|
659 | # ancestors of <root> not ancestors of <dest> | |
|
660 | detachset = repo.changelog.findmissingrevs([commonbase.rev()], | |
|
661 | [root.rev()]) | |
|
661 | 662 | state.update(dict.fromkeys(detachset, nullmerge)) |
|
663 | # detachset can have root, and we definitely want to rebase that | |
|
664 | state[root.rev()] = nullrev | |
|
662 | 665 | return repo['.'].rev(), dest.rev(), state |
|
663 | 666 | |
|
664 | 667 | def clearrebased(ui, repo, state, collapsedas=None): |
General Comments 0
You need to be logged in to leave comments.
Login now