# HG changeset patch # User Yuya Nishihara # Date 1501678342 -32400 # Node ID 5a5f600b06adf4e9663140fcb73adc983d106179 # Parent 16a175b3681e6b91e8cac46a89e41002f52a79d4 rebase: sort collapsed revisions in commit message (issue5643) This fixes the test instability. diff -r 16a175b3681e -r 5a5f600b06ad hgext/rebase.py --- 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()