# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1495349132 14400
# Node ID 655f1e2cfa5ae49f6fae4fcd90836e9074a582c8
# Parent  7640584e697c75a3ce3bf67d9e06b28967e2654a# Parent  99515353c72a4c54e4aac1a2ad4f8f724c7fdc9c
merge with stable

diff -r 7640584e697c -r 655f1e2cfa5a mercurial/bundle2.py
--- 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})
diff -r 7640584e697c -r 655f1e2cfa5a mercurial/obsolete.py
--- a/mercurial/obsolete.py	Sun May 21 13:41:01 2017 +0900
+++ b/mercurial/obsolete.py	Sun May 21 02:45:32 2017 -0400
@@ -789,6 +789,7 @@
         tr = repo.transaction('pushkey: obsolete markers')
         try:
             repo.obsstore.mergemarkers(tr, data)
+            repo.invalidatevolatilesets()
             tr.close()
             return 1
         finally: