Mercurial > hg

diff mercurial/obsolete.py @ 18365:4148414da120

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsolete: process markers in a stable order Using set iteration order gave unstable debugsuccessorssets output with PYTHONHASHSEED=random.
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 02:59:13 +0100
parents a58260bc101f
children 3e92772d5383
line wrap: on
line diff
--- a/mercurial/obsolete.py	Wed Dec 12 02:38:14 2012 +0100
+++ b/mercurial/obsolete.py	Tue Jan 15 02:59:13 2013 +0100
@@ -526,7 +526,7 @@
             #   Having none means pruned node, multiple successors means split,
             #   single successors are standard replacement.
             #
-            for mark in succmarkers[current]:
+            for mark in sorted(succmarkers[current]):
                 for suc in mark[1]:
                     if suc not in cache:
                         if suc in stackedset:
@@ -563,7 +563,7 @@
                 # duplicated entry and successors set that are strict subset of
                 # another one.
                 succssets = []
-                for mark in succmarkers[current]:
+                for mark in sorted(succmarkers[current]):
                     # successors sets contributed by this marker
                     markss = [[]]
                     for suc in mark[1]: