Mercurial > evolve
view docs/README @ 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 | ef361938dfa1 |
children |
line wrap: on
line source
Doc is generated with sphinx. You can generate the doc with: ``` make ``` # Tutorials For updating the tutorials, you need to have the docgraph extension installed (https://pypi.python.org/pypi/hg-docgraph). Then run the test-topic-tutorial.t and test-tutorial.t to update the output if needed. You'll need the dot binary (likely installed by the graphviz package in your package manager) in order to have graphviz graphs rendered in the html output. Simply run make in the docs directory should takes care of the conversion of the tutorial .t files into .rst files. Then sphinx should do the rest of the jobs by rendering graphviz graphs.