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