Mercurial > public > mercurial-scm > hg

diff hgext/rebase.py @ 33622:5a5f600b06ad stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: sort collapsed revisions in commit message (issue5643) This fixes the test instability.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 02 Aug 2017 21:52:22 +0900
parents 52f82e7d6a7e
children 86aca74a063b 2f427b57bf90
line wrap: on
line diff
--- a/hgext/rebase.py	Wed Aug 02 00:02:11 2017 +0900
+++ b/hgext/rebase.py	Wed Aug 02 21:52:22 2017 +0900
@@ -472,7 +472,7 @@
                 commitmsg = self.collapsemsg
             else:
                 commitmsg = 'Collapsed revision'
-                for rebased in self.state:
+                for rebased in sorted(self.state):
                     if rebased not in self.skipped and\
                        self.state[rebased] > nullmerge:
                         commitmsg += '\n* %s' % repo[rebased].description()