Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/rebase.py
changeset 33848 bc9e075133c9
parent 33847 ddf77c0cc169
child 33849 3ae2eaecb49e 
--- a/hgext/rebase.py	Fri Aug 11 01:05:47 2017 -0700
+++ b/hgext/rebase.py	Fri Aug 11 01:36:59 2017 -0700
@@ -445,8 +445,7 @@
             else:
                 commitmsg = 'Collapsed revision'
                 for rebased in sorted(self.state):
-                    if rebased not in self.skipped and\
-                       self.state[rebased] >= revtodo:
+                    if rebased not in self.skipped:
                         commitmsg += '\n* %s' % repo[rebased].description()
                 editopt = True
             editor = cmdutil.getcommiteditor(edit=editopt, editform=editform)
@@ -467,8 +466,7 @@
             else:
                 newrev = repo[newnode].rev()
             for oldrev in self.state.iterkeys():
-                if self.state[oldrev] >= revtodo:
-                    self.state[oldrev] = newrev
+                self.state[oldrev] = newrev
 
         if 'qtip' in repo.tags():
             updatemq(repo, self.state, self.skipped, **opts)
Mercurial