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