# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 2017-05-21 06:45:32
# Node ID 655f1e2cfa5ae49f6fae4fcd90836e9074a582c8
# Parent  7640584e697c75a3ce3bf67d9e06b28967e2654a
# Parent  99515353c72a4c54e4aac1a2ad4f8f724c7fdc9c

merge with stable

diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -1690,6 +1690,7 @@ 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})
diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py
--- a/mercurial/obsolete.py
+++ b/mercurial/obsolete.py
@@ -789,6 +789,7 @@ 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: