# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 2017-08-02 12:52:22
# Node ID 5a5f600b06adf4e9663140fcb73adc983d106179
# Parent  16a175b3681e6b91e8cac46a89e41002f52a79d4

rebase: sort collapsed revisions in commit message (issue5643)

This fixes the test instability.

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -472,7 +472,7 @@ class rebaseruntime(object):
                 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()