Mercurial > evolve
changeset 3743:648552969e88 stable
evolve: point to '--abort' in verbose status message
f6979d64b9fb (evolve: point to '--abort' in error message, 2018-04-22)
changed "hg update -C ." to "hg evolve --abort" in error
messages. This commit makes the same change in the verbose status
message (the one that warns about unfinished evolve).
There's still one mention "hg update -C" in our codebase. That's after
"hg evolve --content-divergent" fails, but I don't think "hg evolve
--abort" works in that case (yet?).
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 10 May 2018 21:37:28 -0700 |
| parents | 422294cd682f |
| children | 4a70392f1723 |
| files | hgext3rd/evolve/__init__.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py Sat Apr 28 18:44:07 2018 +0530 +++ b/hgext3rd/evolve/__init__.py Thu May 10 21:37:28 2018 -0700 @@ -1352,7 +1352,7 @@ @eh.uisetup def setupevolveunfinished(ui): data = ('evolvestate', False, False, _('evolve in progress'), - _("use 'hg evolve --continue' or 'hg update -C .' to abort")) + _("use 'hg evolve --continue' or 'hg evolve --abort' to abort")) cmdutil.unfinishedstates.append(data) afterresolved = ('evolvestate', _('hg evolve --continue'))