repair: move phases code after invalidation code
authorHenrik Stuart <henrik.stuart@edlund.dk>
Wed, 18 Jan 2012 14:50:17 +0100
changeset 15901 73c4b3d0c711
parent 15899 476a981fdf34
child 15902 4252d9f08d7e
repair: move phases code after invalidation code
mercurial/repair.py
--- a/mercurial/repair.py	Mon Jan 16 01:21:30 2012 -0600
+++ b/mercurial/repair.py	Wed Jan 18 14:50:17 2012 +0100
@@ -145,9 +145,6 @@
         for m in updatebm:
             bm[m] = repo['.'].node()
         bookmarks.write(repo)
-        # remove potential unknown phase
-        # XXX using to_strip data would be faster
-        phases.filterunknown(repo)
     except:
         if backupfile:
             ui.warn(_("strip failed, full bundle stored in '%s'\n")
@@ -158,3 +155,7 @@
         raise
 
     repo.destroyed()
+
+    # remove potential unknown phase
+    # XXX using to_strip data would be faster
+    phases.filterunknown(repo)