# HG changeset patch # User Pierre-Yves David # Date 1513833122 -3600 # Node ID 81aae43ee0f1837044858e20a9cb863687f071a8 # Parent 6020f2c9dbd9ad82c2cf13aac091c2b769909110 stablesort: use parent filtering in a place we forgot to Freak merge striked again. diff -r 6020f2c9dbd9 -r 81aae43ee0f1 hgext3rd/evolve/stablesort.py --- a/hgext3rd/evolve/stablesort.py Thu Dec 21 06:18:50 2017 +0100 +++ b/hgext3rd/evolve/stablesort.py Thu Dec 21 06:12:02 2017 +0100 @@ -338,8 +338,8 @@ def getjumps(self, repo, rev): if not self._hasjumpsdata(rev): - parents = repo.changelog.parentrevs(rev) - if parents[1] == nodemod.nullrev: + parents = filterparents(repo.changelog.parentrevs(rev)) + if len(parents) <= 1: self._setjumps(rev, None) else: # merge ! warn the cache @@ -585,8 +585,8 @@ progress(0, '') for idx, rev in enumerate(data): - parents = repo.changelog.parentrevs(rev) - if parents[1] == nodemod.nullrev: + parents = filterparents(repo.changelog.parentrevs(rev)) + if len(parents) <= 1: self._setjumps(rev, None) else: # merge! warn the cache