[PATCH 2 of 3 evolve-ext] setupevolveunfinished: use "hg update -C ." to abort

Martin von Zweigbergk martinvonz at google.com
Fri Oct 28 18:22:55 EDT 2016


# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1477693047 25200
#      Fri Oct 28 15:17:27 2016 -0700
# Node ID 8f59ce14ebb1864eb750a4d3a8c6a9b486aab074
# Parent  d776bbaebc34ff7b0a7e822a1fb2f6ea25a5adfa
setupevolveunfinished: use "hg update -C ." to abort

I don't know what this function does, but it seems like it should
recommend the same way of aborting as other places do.

diff -r d776bbaebc34 -r 8f59ce14ebb1 hgext/evolve.py
--- a/hgext/evolve.py	Fri Oct 28 15:04:40 2016 -0700
+++ b/hgext/evolve.py	Fri Oct 28 15:17:27 2016 -0700
@@ -4044,7 +4044,7 @@
 @eh.uisetup
 def setupevolveunfinished(ui):
     data = ('evolvestate', True, False, _('evolve in progress'),
-           _("use 'hg evolve --continue' or 'hg update' to abort"))
+           _("use 'hg evolve --continue' or 'hg update -C .' to abort"))
     cmdutil.unfinishedstates.append(data)
 
 @eh.wrapfunction(hg, 'clean')


More information about the Mercurial-devel mailing list