mercurial/exchange.py
changeset 27558 b5b54825de6b
parent 27523 68b9abf1cb82
child 27734 5c0fd878779c
--- a/mercurial/exchange.py	Sun Dec 27 15:24:48 2015 -0800
+++ b/mercurial/exchange.py	Fri Dec 18 13:53:50 2015 -0600
@@ -1399,10 +1399,14 @@
         remoteobs = pullop.remote.listkeys('obsolete')
         if 'dump0' in remoteobs:
             tr = pullop.gettransaction()
+            markers = []
             for key in sorted(remoteobs, reverse=True):
                 if key.startswith('dump'):
                     data = base85.b85decode(remoteobs[key])
-                    pullop.repo.obsstore.mergemarkers(tr, data)
+                    version, newmarks = obsolete._readmarkers(data)
+                    markers += newmarks
+            if markers:
+                pullop.repo.obsstore.add(tr, markers)
             pullop.repo.invalidatevolatilesets()
     return tr