Mercurial > public > mercurial-scm > hg-stable
diff mercurial/bundle2.py @ 32425:655f1e2cfa5a
merge with stable
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 21 May 2017 02:45:32 -0400 |
| parents | d7f93ebbbbdf 99515353c72a |
| children | e70d6dbde713 |
line wrap: on
line diff
--- a/mercurial/bundle2.py Sun May 21 13:41:01 2017 +0900 +++ b/mercurial/bundle2.py Sun May 21 02:45:32 2017 -0400 @@ -1690,6 +1690,7 @@ op.repo.ui.debug('ignoring obsolescence markers, feature not enabled') return new = op.repo.obsstore.mergemarkers(tr, markerdata) + op.repo.invalidatevolatilesets() if new: op.repo.ui.status(_('%i new obsolescence markers\n') % new) op.records.add('obsmarkers', {'new': new})