Show More
@@ -148,7 +148,6 b' class rebaseruntime(object):' | |||
|
148 | 148 | self.activebookmark = None |
|
149 | 149 | self.dest = None |
|
150 | 150 | self.skipped = set() |
|
151 | self.destancestors = set() | |
|
152 | 151 | |
|
153 | 152 | self.collapsef = opts.get('collapse', False) |
|
154 | 153 | self.collapsemsg = cmdutil.logmessage(ui, opts) |
@@ -336,11 +335,9 b' class rebaseruntime(object):' | |||
|
336 | 335 | |
|
337 | 336 | (self.originalwd, self.dest, self.state) = result |
|
338 | 337 | if self.collapsef: |
|
339 |
|
|
|
340 |
|
|
|
341 | inclusive=True) | |
|
342 | self.external = externalparent(self.repo, self.state, | |
|
343 | self.destancestors) | |
|
338 | destancestors = self.repo.changelog.ancestors([self.dest], | |
|
339 | inclusive=True) | |
|
340 | self.external = externalparent(self.repo, self.state, destancestors) | |
|
344 | 341 | |
|
345 | 342 | if dest.closesbranch() and not self.keepbranchesf: |
|
346 | 343 | self.ui.status(_('reopening closed branch head %s\n') % dest) |
@@ -360,11 +357,6 b' class rebaseruntime(object):' | |||
|
360 | 357 | raise error.Abort(_('cannot collapse multiple named ' |
|
361 | 358 | 'branches')) |
|
362 | 359 | |
|
363 | # Rebase | |
|
364 | if not self.destancestors: | |
|
365 | self.destancestors = repo.changelog.ancestors([self.dest], | |
|
366 | inclusive=True) | |
|
367 | ||
|
368 | 360 | # Keep track of the active bookmarks in order to reset them later |
|
369 | 361 | self.activebookmark = self.activebookmark or repo._activebookmark |
|
370 | 362 | if self.activebookmark: |
General Comments 0
You need to be logged in to leave comments.
Login now