Mercurial > hg > mercurial-source
changeset 33170:655f1e2cfa5a
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Sun, 21 May 2017 02:45:32 -0400 |
parents | 7640584e697c (current diff) 99515353c72a (diff) |
children | 4a23cdb32968 |
files | mercurial/bundle2.py mercurial/obsolete.py |
diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundle2.py +++ b/mercurial/bundle2.py @@ -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})