Mercurial > evolve
changeset 3314:110202a00de2
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.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 18 Dec 2017 18:49:34 +0100 |
| parents | efceae0bfa35 |
| children | c153441cdc0e |
| files | hgext3rd/evolve/stablesort.py |
| diffstat | 1 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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