diff mercurial/obsolete.py @ 32387:655f1e2cfa5a

merge with stable
author Augie Fackler <augie@google.com>
date Sun, 21 May 2017 02:45:32 -0400
parents df448de7cf3b 99515353c72a
children 08d02c1d7e67
line wrap: on
line diff
--- 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: