changeset 19475:e24531a23ae4 stable

update: clear any clearable unfinished operations (issue3955) Unclearable operations will cause an abort.
author Matt Mackall <mpm@selenic.com>
date Wed, 24 Jul 2013 23:30:24 -0500
parents 894fd1a7c533
children 4fed15d4c5aa
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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: