Mercurial > hg
diff mercurial/help/config.txt @ 34705:23ed47a895d5
config: graduate experimental.updatecheck to commands.update.check
.. feature::
New `commands.update.check` feature to adjust constraints on when
`hg update` will allow updates with a dirty working copy.
also
.. bc::
The `experimental.updatecheck` name for the new `commands.update.check`
feature is now deprecated, and will be removed after this release.
Differential Revision: https://phab.mercurial-scm.org/D1070
author | Augie Fackler <augie@google.com> |
---|---|
date | Sat, 14 Oct 2017 03:13:50 -0400 |
parents | a667f0ca1d5f |
children | ee5f0d047b41 |
line wrap: on
line diff
--- a/mercurial/help/config.txt Sat Oct 14 15:42:38 2017 -0400 +++ b/mercurial/help/config.txt Sat Oct 14 03:13:50 2017 -0400 @@ -442,6 +442,18 @@ Make paths in :hg:`status` output relative to the current directory. (default: False) +``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``) + ``update.requiredest`` Require that the user pass a destination when running :hg:`update`. For example, :hg:`update .::` will be allowed, but a plain :hg:`update`