Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stablesort: fix head start computation
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 18 Dec 2017 18:49:34 +0100
changeset 3314 110202a00de2
parent 3313 efceae0bfa35
child 3315 c153441cdc0e
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.
hgext3rd/evolve/stablesort.py file | annotate | diff | comparison | revisions 
--- 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
evolve