Mercurial > public > mercurial-scm > hg

diff mercurial/localrepo.py @ 15611:ec8a49c46d7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 05 Dec 2011 17:48:40 -0600
parents cc24e4ed3e0c b8d8599410da
children 218ec96c45d7
line wrap: on
line diff
--- a/mercurial/localrepo.py	Fri Dec 02 18:36:32 2011 +0100
+++ b/mercurial/localrepo.py	Mon Dec 05 17:48:40 2011 -0600
@@ -852,7 +852,6 @@
                         % self.dirstate.branch())
 
             self.dirstate.invalidate()
-            self.destroyed()
             parents = tuple([p.rev() for p in self.parents()])
             if len(parents) > 1:
                 ui.status(_('working directory now based on '
@@ -860,6 +859,7 @@
             else:
                 ui.status(_('working directory now based on '
                             'revision %d\n') % parents)
+        self.destroyed()
         return 0
 
     def invalidatecaches(self):