Mercurial > evolve
view MANIFEST.in @ 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 | b3dbba6e34c9 |
children | 48b30ff742cb |
line wrap: on
line source
exclude contrib recursive-exclude contrib * exclude hgext3rd/evolve/hack recursive-exclude hgext3rd/evolve/hack * exclude hgext3rd/evolve/legacy.py exclude Makefile exclude tests/test-drop.t exclude tests/test-inhibit.t exclude tests/test-oldconvert.t exclude docs/tutorial/.netlify include COPYING include docs/figures/hgview-example.png include docs/makefile include docs/*.py include docs/README include docs/*.rst include docs/static/*.svg include docs/tutorials/*.t include hgext3rd/__init__.py include hgext3rd/evolve/*.py include hgext3rd/evolve/thirdparty/*.py include hgext3rd/topic/*.py include hgext3rd/topic/README include MANIFEST.in include README include CHANGELOG include setup.py include tests/*.py include tests/*.sh include tests/testlib/*.sh include tests/*.t recursive-include docs/tutorial *.rst recursive-include docs/tutorial *.css include docs/tutorial/standalone.html recursive-include docs/tutorial *.js recursive-include docs/tutorial *.md recursive-include docs/tutorial *.py recursive-include docs/tutorial *.sh recursive-include docs/tutorial *.t prune debian recursive-include docs/figures *.svg