--- a/mercurial/discovery.py Mon May 29 05:21:38 2017 +0200
+++ b/mercurial/discovery.py Mon May 29 05:23:30 2017 +0200
@@ -347,13 +347,10 @@
oldhs = set(remoteheads)
oldhs.update(unsyncedheads)
dhs = None # delta heads, the new heads on branch
- if not repo.obsstore:
- discardedheads = set()
- newhs = set(newheads)
- else:
- newhs, discardedheads = _postprocessobsolete(pushop,
- allfuturecommon,
- newheads)
+ if repo.obsstore:
+ result = _postprocessobsolete(pushop, allfuturecommon, newheads)
+ newheads = sorted(result[0])
+ newhs = set(newheads)
newhs.update(unsyncedheads)
if unsyncedheads:
if None in unsyncedheads: