equal
deleted
inserted
replaced
690 state[r] = nullmerge |
690 state[r] = nullmerge |
691 if len(roots) > 1: |
691 if len(roots) > 1: |
692 # If we have multiple roots, we may have "hole" in the rebase set. |
692 # If we have multiple roots, we may have "hole" in the rebase set. |
693 # Rebase roots that descend from those "hole" should not be detached as |
693 # Rebase roots that descend from those "hole" should not be detached as |
694 # other root are. We use the special `revignored` to inform rebase that |
694 # other root are. We use the special `revignored` to inform rebase that |
695 # the revision should be ignored but that `defineparent` should search |
695 # the revision should be ignored but that `defineparents` should search |
696 # a rebase destination that make sense regarding rebaset topology. |
696 # a rebase destination that make sense regarding rebased topology. |
697 rebasedomain = set(repo.revs('%ld::%ld', rebaseset, rebaseset)) |
697 rebasedomain = set(repo.revs('%ld::%ld', rebaseset, rebaseset)) |
698 for ignored in set(rebasedomain) - set(rebaseset): |
698 for ignored in set(rebasedomain) - set(rebaseset): |
699 state[ignored] = revignored |
699 state[ignored] = revignored |
700 return repo['.'].rev(), dest.rev(), state |
700 return repo['.'].rev(), dest.rev(), state |
701 |
701 |