Read about our upcoming Code of Conduct on this issue

This instance was upgraded to Heptapod 0.28.0 today

Commit c07c04d7 authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

update: reformat the `commands.update.check` help

This make the various option clearer.

Differential Revision: https://phab.mercurial-scm.org/D11852
parent 4d59e0f909e0
Pipeline #29865 failed with stages
in 63 minutes and 36 seconds
......@@ -513,13 +513,18 @@ effect and style see :hg:`help color`.
``update.check``
Determines what level of checking :hg:`update` will perform before moving
to a destination revision. Valid values are ``abort``, ``none``,
``linear``, and ``noconflict``. ``abort`` always fails if the working
directory has uncommitted changes. ``none`` performs no checking, and may
result in a merge with uncommitted changes. ``linear`` allows any update
as long as it follows a straight line in the revision history, and may
trigger a merge with uncommitted changes. ``noconflict`` will allow any
update which would not trigger a merge with uncommitted changes, if any
are present.
``linear``, and ``noconflict``.
- ``abort`` always fails if the working directory has uncommitted changes.
- ``none`` performs no checking, and may result in a merge with uncommitted changes.
- ``linear`` allows any update as long as it follows a straight line in the
revision history, and may trigger a merge with uncommitted changes.
- ``noconflict`` will allow any update which would not trigger a merge with
uncommitted changes, if any are present.
(default: ``linear``)
``update.requiredest``
......
......@@ -1517,26 +1517,38 @@ Test section name with dot
"commands.update.check"
Determines what level of checking 'hg update' will perform before
moving to a destination revision. Valid values are "abort", "none",
"linear", and "noconflict". "abort" always fails if the working
directory has uncommitted changes. "none" performs no checking, and
may result in a merge with uncommitted changes. "linear" allows any
update as long as it follows a straight line in the revision history,
and may trigger a merge with uncommitted changes. "noconflict" will
allow any update which would not trigger a merge with uncommitted
changes, if any are present. (default: "linear")
"linear", and "noconflict".
- "abort" always fails if the working directory has uncommitted
changes.
- "none" performs no checking, and may result in a merge with
uncommitted changes.
- "linear" allows any update as long as it follows a straight line in
the revision history, and may trigger a merge with uncommitted
changes.
- "noconflict" will allow any update which would not trigger a merge
with uncommitted changes, if any are present.
(default: "linear")
$ hg help config.commands.update.check
"commands.update.check"
Determines what level of checking 'hg update' will perform before
moving to a destination revision. Valid values are "abort", "none",
"linear", and "noconflict". "abort" always fails if the working
directory has uncommitted changes. "none" performs no checking, and
may result in a merge with uncommitted changes. "linear" allows any
update as long as it follows a straight line in the revision history,
and may trigger a merge with uncommitted changes. "noconflict" will
allow any update which would not trigger a merge with uncommitted
changes, if any are present. (default: "linear")
"linear", and "noconflict".
- "abort" always fails if the working directory has uncommitted
changes.
- "none" performs no checking, and may result in a merge with
uncommitted changes.
- "linear" allows any update as long as it follows a straight line in
the revision history, and may trigger a merge with uncommitted
changes.
- "noconflict" will allow any update which would not trigger a merge
with uncommitted changes, if any are present.
(default: "linear")
$ hg help config.ommands.update.check
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment