Mercurial > hg
view tests/test-revisions.t @ 41765:0b2361c2c493
tests: change the paths slightly in test-rebase-inmemory.t
c/c was a little difficult to understand (and verify that it was the *correct*
'c/' that was being talked about), and it's useful to have multiple directories
to prove that we are able to detect this even if there's no files (just a
subdirectory) in the immediate directory that's conflicting.
Differential Revision: https://phab.mercurial-scm.org/D5998
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Thu, 21 Feb 2019 19:11:28 -0800 |
parents | d916ed3ca951 |
children | 95c4cca641f6 |
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 ..