Mercurial > hg

changeset 32387:655f1e2cfa5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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	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})
--- 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: