Mercurial > hg
view tests/test-revisions.t @ 39111:46da52f4b820
commit: try hard to reuse p1 manifest if nothing changed
This is all for commit reproducibility on "hg convert".
With this change, p1 manifest is reused if ctx.files() *to be committed* is
empty, and if new manifest entry is identical to p1. This is important
property for "hg convert" since memctx.files() built from a convert source
may be either a) more narrowed thanks to a committed ctx.files() which
provides more accurate status, or b) containing redundant files because of
sloppy filtering on e.g. octopus merge.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sat, 07 Jul 2018 22:40:39 +0900 |
parents | 4c4825db29e1 |
children | d916ed3ca951 |
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:0 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 ..