Show More
@@ -1161,19 +1161,20 b' def _computeobsoletenotrebased(repo, reb' | |||
|
1161 | 1161 | # Build a mapping succesor => obsolete nodes for the obsolete |
|
1162 | 1162 | # nodes to be rebased |
|
1163 | 1163 | allsuccessors = {} |
|
1164 | cl = repo.changelog | |
|
1164 | 1165 | for r in rebasesetrevs: |
|
1165 | 1166 | n = repo[r] |
|
1166 | 1167 | if n.obsolete(): |
|
1167 |
node = |
|
|
1168 | node = cl.node(r) | |
|
1168 | 1169 | for s in obsolete.allsuccessors(repo.obsstore, [node]): |
|
1169 |
allsuccessors[ |
|
|
1170 | allsuccessors[cl.rev(s)] = cl.rev(node) | |
|
1170 | 1171 | |
|
1171 | 1172 | if allsuccessors: |
|
1172 | 1173 | # Look for successors of obsolete nodes to be rebased among |
|
1173 | 1174 | # the ancestors of dest |
|
1174 |
ancs = |
|
|
1175 |
|
|
|
1176 |
|
|
|
1175 | ancs = cl.ancestors([repo[dest].rev()], | |
|
1176 | stoprev=min(allsuccessors), | |
|
1177 | inclusive=True) | |
|
1177 | 1178 | for s in allsuccessors: |
|
1178 | 1179 | if s in ancs: |
|
1179 | 1180 | obsoletenotrebased[allsuccessors[s]] = s |
General Comments 0
You need to be logged in to leave comments.
Login now