Show More
@@ -214,8 +214,8 b' def rebase(ui, repo, **opts):' | |||||
214 | else: |
|
214 | else: | |
215 | originalwd, target, state = result |
|
215 | originalwd, target, state = result | |
216 | if collapsef: |
|
216 | if collapsef: | |
217 |
targetancestors = |
|
217 | targetancestors = repo.changelog.ancestors([target], | |
218 | targetancestors.add(target) |
|
218 | inclusive=True) | |
219 | external = checkexternal(repo, state, targetancestors) |
|
219 | external = checkexternal(repo, state, targetancestors) | |
220 |
|
220 | |||
221 | if keepbranchesf: |
|
221 | if keepbranchesf: | |
@@ -233,8 +233,7 b' def rebase(ui, repo, **opts):' | |||||
233 |
|
233 | |||
234 | # Rebase |
|
234 | # Rebase | |
235 | if not targetancestors: |
|
235 | if not targetancestors: | |
236 |
targetancestors = |
|
236 | targetancestors = repo.changelog.ancestors([target], inclusive=True) | |
237 | targetancestors.add(target) |
|
|||
238 |
|
237 | |||
239 | # Keep track of the current bookmarks in order to reset them later |
|
238 | # Keep track of the current bookmarks in order to reset them later | |
240 | currentbookmarks = repo._bookmarks.copy() |
|
239 | currentbookmarks = repo._bookmarks.copy() |
General Comments 0
You need to be logged in to leave comments.
Login now