Mercurial > evolve
view tests/test-check-setup-manifest.t @ 3782:27cf636b2f4d stable
next: respect `commands.update.check` config option in `hg next` (issue5808)
`commands.update.check` config option determines what level of checking should
be done when we update to another revision. When we set this config option to
`noconflict`, it updates your working directory to a specified revision only
when there will be no conflicts which is a very nice behavior.
This patch adds logic to respect the config option so that we can have that nice
behavior with `hg next` too.
It turns out, we just needed to use hg.updatetotally() and add some cases to
check config option.
Right now, we only respect the config if value is set to `noconflict`. Otherwise
we fallback to the default behavior.
This is a part of fixing issue5808. Test changes demonstrate the fix.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sun, 03 Jun 2018 02:37:13 +0530 |
parents | 39d84b395343 |
children | f2139537c2be |
line wrap: on
line source
#require test-repo $ checkcm() { > if ! (which check-manifest > /dev/null); then > echo skipped: missing tool: check-manifest; > exit 80; > fi; > }; $ checkcm $ cat << EOF >> $HGRCPATH > [experimental] > evolution=all > EOF Run check manifest: $ cd $TESTDIR/.. $ check-manifest lists of files in version control and sdist match