Mercurial > public > mercurial-scm > hg-stable

diff mercurial/hg.py @ 19371:648d1974b3f3

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 Sun, 30 Jun 2013 15:19:39 -0500
parents 3b96d6e44a4d 0af993732f66
children 6f72e7d28b35
line wrap: on
line diff
--- a/mercurial/hg.py	Sun Jun 30 14:56:04 2013 -0500
+++ b/mercurial/hg.py	Sun Jun 30 15:19:39 2013 -0500
@@ -471,6 +471,7 @@
 def clean(repo, node, show_stats=True):
     """forcibly switch the working directory to node, clobbering changes"""
     stats = updaterepo(repo, node, True)
+    util.unlinkpath(repo.join('graftstate'), ignoremissing=True)
     if show_stats:
         _showstats(repo, stats)
     return stats[3] > 0