Mercurial > evolve
view .hgignore @ 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 | aad37ffd7d58 |
children | ba316ce15040 |
line wrap: on
line source
syntax: re /figures/[^/]+\.png$ ^html/ \.pyc$ ~$ \.swp$ \.orig$ \.rej$ ^tests/.*\.err$ ^tests/easy_run.sh$ ^build/ ^dist/ ^MANIFEST$ ^docs/tutorials/.*\.rst$ \.ico$ tests/\.testtimes ^docs/training/graphs/ ^docs/training/html/ ^docs/training/index.html ^docs/training/graphviz-images/ ^docs/training/img/ ^docs/training/output/ ^docs/training/pandocfilters/