--- a/mercurial/repair.py	Thu Jun 22 10:10:02 2017 -0700
+++ b/mercurial/repair.py	Thu Jun 15 00:15:52 2017 -0700
@@ -49,7 +49,11 @@
         bundletype = "HG10UN"
 
     outgoing = discovery.outgoing(repo, missingroots=bases, missingheads=heads)
-    contentopts = {'cg.version': cgversion, 'obsolescence': obsolescence}
+    contentopts = {
+        'cg.version': cgversion,
+        'obsolescence': obsolescence,
+        'phases': True,
+    }
     return bundle2.writenewbundle(repo.ui, repo, 'strip', name, bundletype,
                                   outgoing, contentopts, vfs, compression=comp)
 
@@ -194,6 +198,7 @@
             deleteobsmarkers(repo.obsstore, stripobsidx)
             del repo.obsstore
 
+        repo._phasecache.filterunknown(repo)
         if tmpbundlefile:
             ui.note(_("adding branch\n"))
             f = vfs.open(tmpbundlefile, "rb")