diff --git a/mercurial/exchange.py b/mercurial/exchange.py index 48b9fbfb00b9067c2314e84a31815f4fa743c4cf_bWVyY3VyaWFsL2V4Y2hhbmdlLnB5..2c70dd03b74395fbec276a2e2d1d3b8347268a5d_bWVyY3VyaWFsL2V4Y2hhbmdlLnB5 100644 --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -1140,7 +1140,7 @@ return pushop.stepsdone.add(b'obsmarkers') if pushop.outobsmarkers: - markers = sorted(pushop.outobsmarkers) + markers = _sortedmarkers(pushop.outobsmarkers) bundle2.buildobsmarkerspart(bundler, markers) @@ -1475,7 +1475,8 @@ if pushop.outobsmarkers: pushop.ui.debug(b'try to push obsolete markers to remote\n') rslts = [] - remotedata = obsolete._pushkeyescape(sorted(pushop.outobsmarkers)) + markers = _sortedmarkers(pushop.outobsmarkers) + remotedata = obsolete._pushkeyescape(markers) for key in sorted(remotedata, reverse=True): # reverse sort to ensure we end with dump0 data = remotedata[key]