changeset 43168 | 01e8eefd9434 |
parent 43131 | c17a63eb5d4c |
child 43277 | 48b9fbfb00b9 |
--- a/mercurial/exchange.py Thu Oct 10 04:34:58 2019 +0200 +++ b/mercurial/exchange.py Thu Oct 10 20:27:34 2019 +0200 @@ -2567,7 +2567,8 @@ heads = repo.heads() subset = [c.node() for c in repo.set(b'::%ln', heads)] markers = repo.obsstore.relevantmarkers(subset) - markers = sorted(markers) + # last item of marker tuple ('parents') may be None or a tuple + markers = sorted(markers, key=lambda m: m[:-1] + (m[-1] or (),)) bundle2.buildobsmarkerspart(bundler, markers)