Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: clear any clearable unfinished operations (issue3955) stable
authorMatt Mackall <mpm@selenic.com>
Wed, 24 Jul 2013 23:30:24 -0500
branchstable
changeset 19475 e24531a23ae4
parent 19474 894fd1a7c533
child 19476 4fed15d4c5aa
update: clear any clearable unfinished operations (issue3955) Unclearable operations will cause an abort.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Wed Jul 24 23:27:30 2013 -0500
+++ b/mercurial/commands.py	Wed Jul 24 23:30:24 2013 -0500
@@ -5820,6 +5820,8 @@
     if rev is None or rev == '':
         rev = node
 
+    cmdutil.clearunfinished(repo)
+
     # with no argument, we also move the current bookmark, if any
     movemarkfrom = None
     if rev is None:
mercurial