Mercurial > hg
view tests/test-revisions.t @ 46103:3f82a915ab2a
histedit: tweak `edit` message to try and guide users to our workflow
histedit predates evolve, so it drops you on an _uncommitted_ version
of the commit you're amending/splitting, which is in contrast to git
which expects you to use `git commit --amend` (I think - I'm basing
this on internal bug reports). My hope is that this output will guide
users a little more towards the expected workflow.
Differential Revision: https://phab.mercurial-scm.org/D9560
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 10 Dec 2020 11:42:49 -0500 |
parents | 95c4cca641f6 |
children | be3d8178251e |
line wrap: on
line source
$ hg init repo $ cd repo $ echo 0 > a $ hg ci -qAm 0 $ for i in 5 8 14 43 167; do > hg up -q 0 > echo $i > a > hg ci -qm $i > done $ cat <<EOF >> .hg/hgrc > [alias] > l = log -T '{rev}:{shortest(node,1)}\n' > EOF $ hg l 5:00f 4:7ba5d 3:7ba57 2:72 1:9 0:b $ cat <<EOF >> .hg/hgrc > [experimental] > revisions.disambiguatewithin=not 4 > EOF $ hg l 5:00 4:7ba5d 3:7b 2:72 1:9 0:b 9 was unambiguous and still is $ hg l -r 9 1:9 7 was ambiguous and still is $ hg l -r 7 abort: 00changelog.i@7: ambiguous identifier [255] 7b is no longer ambiguous $ hg l -r 7b 3:7b $ cd ..