changeset 22325 | 3363f2d36015 |
parent 22309 | a65697c3f20e |
child 22326 | 370b71622670 |
--- a/mercurial/obsolete.py Thu Aug 21 17:36:05 2014 -0700 +++ b/mercurial/obsolete.py Thu Aug 21 17:42:50 2014 -0700 @@ -369,8 +369,11 @@ return len(new) def mergemarkers(self, transaction, data): + """merge a binary stream of markers inside the obsstore + + Returns the number of new markers added.""" markers = _readmarkers(data) - self.add(transaction, markers) + return self.add(transaction, markers) def _load(self, markers): for mark in markers: