Mercurial > evolve
view tests/test-options.t @ 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 | 9f42f819267b |
children | 8fcee1e65e29 |
line wrap: on
line source
$ cat >> $HGRCPATH <<EOF > [ui] > logtemplate={rev}:{node|short}[{bookmarks}] ({obsolete}/{phase}) {desc|firstline}\n > [extensions] > EOF $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH $ mkcommit() { > echo "$1" > "$1" > hg add "$1" > hg ci -m "add $1" > } $ hg init repo $ cd repo $ mkcommit a $ mkcommit b test disabling commands $ cat >> .hg/hgrc <<EOF > [experimental] > evolution=createmarkers > allowunstable > exchange > EOF $ hg prune | head -n 2 hg: unknown command 'prune' Mercurial Distributed SCM