Mercurial > hg
view tests/test-update-dest.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 | eb586ed5d8ce |
children | 8d72e29ad1e0 |
line wrap: on
line source
Test update.requiredest $ cd $TESTTMP $ cat >> $HGRCPATH <<EOF > [commands] > update.requiredest = True > EOF $ hg init repo $ cd repo $ echo a >> a $ hg commit -qAm aa $ hg up abort: you must specify a destination (for example: hg update ".::") [255] $ hg up . 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ HGPLAIN=1 hg up 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg --config commands.update.requiredest=False up 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd .. Check update.requiredest interaction with pull --update $ hg clone repo clone updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd repo $ echo a >> a $ hg commit -qAm aa $ cd ../clone $ hg pull --update abort: update destination required by configuration (use hg pull followed by hg update DEST) [255] $ cd .. update.requiredest should silent the "hg update" text after pull $ hg init repo1 $ cd repo1 $ hg pull ../repo pulling from ../repo requesting all changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files new changesets 8f0162e483d0:048c2cb95949