##// END OF EJS Templates
obsolete: process markers in a stable order...
Mads Kiilerich -
r18365:4148414d default
parent child Browse files
Show More
@@ -526,7 +526,7 b' def successorssets(repo, initialnode, ca'
526 # Having none means pruned node, multiple successors means split,
526 # Having none means pruned node, multiple successors means split,
527 # single successors are standard replacement.
527 # single successors are standard replacement.
528 #
528 #
529 for mark in succmarkers[current]:
529 for mark in sorted(succmarkers[current]):
530 for suc in mark[1]:
530 for suc in mark[1]:
531 if suc not in cache:
531 if suc not in cache:
532 if suc in stackedset:
532 if suc in stackedset:
@@ -563,7 +563,7 b' def successorssets(repo, initialnode, ca'
563 # duplicated entry and successors set that are strict subset of
563 # duplicated entry and successors set that are strict subset of
564 # another one.
564 # another one.
565 succssets = []
565 succssets = []
566 for mark in succmarkers[current]:
566 for mark in sorted(succmarkers[current]):
567 # successors sets contributed by this marker
567 # successors sets contributed by this marker
568 markss = [[]]
568 markss = [[]]
569 for suc in mark[1]:
569 for suc in mark[1]:
@@ -76,10 +76,10 b' A_1 have two direct and divergent succes'
76 d20a80d4def3
76 d20a80d4def3
77 d20a80d4def3
77 d20a80d4def3
78 007dc284c1f8
78 007dc284c1f8
79 82623d38b9ba
79 392fd25390da
80 392fd25390da
80 82623d38b9ba
81 82623d38b9ba
81 82623d38b9ba
82 82623d38b9ba
82 82623d38b9ba
83 392fd25390da
83 392fd25390da
84 392fd25390da
84 392fd25390da
85 $ hg log -r 'divergent()'
85 $ hg log -r 'divergent()'
@@ -123,10 +123,10 b' indirect divergence with known changeset'
123 d20a80d4def3
123 d20a80d4def3
124 d20a80d4def3
124 d20a80d4def3
125 007dc284c1f8
125 007dc284c1f8
126 82623d38b9ba
126 01f36c5a8fda
127 01f36c5a8fda
127 82623d38b9ba
128 82623d38b9ba
128 82623d38b9ba
129 82623d38b9ba
129 82623d38b9ba
130 392fd25390da
130 392fd25390da
131 01f36c5a8fda
131 01f36c5a8fda
132 01f36c5a8fda
132 01f36c5a8fda
@@ -158,10 +158,10 b' indirect divergence with known changeset'
158 d20a80d4def3
158 d20a80d4def3
159 d20a80d4def3
159 d20a80d4def3
160 007dc284c1f8
160 007dc284c1f8
161 82623d38b9ba
161 392fd25390da
162 392fd25390da
162 82623d38b9ba
163 82623d38b9ba
163 82623d38b9ba
164 82623d38b9ba
164 82623d38b9ba
165 392fd25390da
165 392fd25390da
166 392fd25390da
166 392fd25390da
167 $ hg log -r 'divergent()'
167 $ hg log -r 'divergent()'
General Comments 0
You need to be logged in to leave comments. Login now