Show More
@@ -445,8 +445,7 b' class rebaseruntime(object):' | |||||
445 | else: |
|
445 | else: | |
446 | commitmsg = 'Collapsed revision' |
|
446 | commitmsg = 'Collapsed revision' | |
447 | for rebased in sorted(self.state): |
|
447 | for rebased in sorted(self.state): | |
448 |
if rebased not in self.skipped |
|
448 | if rebased not in self.skipped: | |
449 | self.state[rebased] >= revtodo: |
|
|||
450 | commitmsg += '\n* %s' % repo[rebased].description() |
|
449 | commitmsg += '\n* %s' % repo[rebased].description() | |
451 | editopt = True |
|
450 | editopt = True | |
452 | editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) |
|
451 | editor = cmdutil.getcommiteditor(edit=editopt, editform=editform) | |
@@ -467,8 +466,7 b' class rebaseruntime(object):' | |||||
467 | else: |
|
466 | else: | |
468 | newrev = repo[newnode].rev() |
|
467 | newrev = repo[newnode].rev() | |
469 | for oldrev in self.state.iterkeys(): |
|
468 | for oldrev in self.state.iterkeys(): | |
470 |
|
|
469 | self.state[oldrev] = newrev | |
471 | self.state[oldrev] = newrev |
|
|||
472 |
|
470 | |||
473 | if 'qtip' in repo.tags(): |
|
471 | if 'qtip' in repo.tags(): | |
474 | updatemq(repo, self.state, self.skipped, **opts) |
|
472 | updatemq(repo, self.state, self.skipped, **opts) |
General Comments 0
You need to be logged in to leave comments.
Login now