Show More
@@ -34,6 +34,7 b' revignored = -3' | |||
|
34 | 34 | revprecursor = -4 |
|
35 | 35 | # plain prune (no successor) |
|
36 | 36 | revpruned = -5 |
|
37 | revskipped = (revignored, revprecursor, revpruned) | |
|
37 | 38 | |
|
38 | 39 | cmdtable = {} |
|
39 | 40 | command = cmdutil.command(cmdtable) |
@@ -681,7 +682,7 b' def defineparents(repo, rev, target, sta' | |||
|
681 | 682 | elif p1n in state: |
|
682 | 683 | if state[p1n] == nullmerge: |
|
683 | 684 | p1 = target |
|
684 |
elif state[p1n] in |
|
|
685 | elif state[p1n] in revskipped: | |
|
685 | 686 | p1 = nearestrebased(repo, p1n, state) |
|
686 | 687 | if p1 is None: |
|
687 | 688 | p1 = target |
@@ -697,7 +698,7 b' def defineparents(repo, rev, target, sta' | |||
|
697 | 698 | if p2n in state: |
|
698 | 699 | if p1 == target: # p1n in targetancestors or external |
|
699 | 700 | p1 = state[p2n] |
|
700 |
elif state[p2n] in |
|
|
701 | elif state[p2n] in revskipped: | |
|
701 | 702 | p2 = nearestrebased(repo, p2n, state) |
|
702 | 703 | if p2 is None: |
|
703 | 704 | # no ancestors rebased yet, detach |
General Comments 0
You need to be logged in to leave comments.
Login now