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