merge with stable

mercurial/bundle2.py

@@ -1690,6 +1690,7 b' def handleobsmarker(op, inpart):'
         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})

mercurial/obsolete.py

@@ -789,6 +789,7 b' def pushmarker(repo, key, old, new):'
         tr = repo.transaction('pushkey: obsolete markers')
         try:
             repo.obsstore.mergemarkers(tr, data)
+            repo.invalidatevolatilesets()
             tr.close()
             return 1
         finally: