Mercurial > hg

changeset 15901:73c4b3d0c711

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
repair: move phases code after invalidation code
author Henrik Stuart <henrik.stuart@edlund.dk>
date Wed, 18 Jan 2012 14:50:17 +0100
parents 476a981fdf34
children 4252d9f08d7e
files mercurial/repair.py
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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)