# HG changeset patch # User Pierre-Yves David # Date 1513619374 -3600 # Node ID 110202a00de2df389fe6b7258f38fb24a98d5740 # Parent efceae0bfa355d6ac03334eb4102792920a3f164 stablesort: fix head start computation The recursion was wrong and provided wrong result. As a side effect, this seems to hint that `stablesort_mergepoint_bounded` is not giving the right result for complex set. diff -r efceae0bfa35 -r 110202a00de2 hgext3rd/evolve/stablesort.py --- a/hgext3rd/evolve/stablesort.py Mon Dec 18 08:36:52 2017 +0100 +++ b/hgext3rd/evolve/stablesort.py Mon Dec 18 18:49:34 2017 +0100 @@ -289,8 +289,7 @@ mid = stablesort_mergepoint_bounded(repo, ps[1], mid_revs) # And follow up with part othe parent we can inherit from - bottom_revs = cl.ancestors([ps[0]], inclusive=True) - bottom = stablesort_mergepoint_bounded(repo, ps[0], bottom_revs) + bottom = stablesort_mergepoint_head(repo, ps[0]) return bottom + mid + top