changeset 32201 | 4462a981e8df |
parent 32166 | 42efb1b2cfb8 |
child 32222 | 6068712cbf03 |
--- a/mercurial/exchange.py Tue May 02 17:05:22 2017 +0900 +++ b/mercurial/exchange.py Wed Apr 26 21:56:47 2017 +0900 @@ -16,7 +16,6 @@ nullid, ) from . import ( - base85, bookmarks as bookmod, bundle2, changegroup, @@ -1509,7 +1508,7 @@ markers = [] for key in sorted(remoteobs, reverse=True): if key.startswith('dump'): - data = base85.b85decode(remoteobs[key]) + data = util.b85decode(remoteobs[key]) version, newmarks = obsolete._readmarkers(data) markers += newmarks if markers: