view mercurial/helptext/deprecated.txt @ 45524:6877b0ee5f9d

mergestate: introduce a new ACTION_KEEP_NEW

`ACTION_KEEP` is overloaded and it's hard to figure out how we end up with this
KEEP, what was the state of things.

In a previous patch, we introduced `ACTION_KEEP_ABSENT` which represents files
which are kept absent in the working directory.

There is another special case where we keep the file when it's not present on
both ancestor and remote side. We introduce a dedicated action for that.

The goal is to use these information to make bid merge smarter.

Differential Revision: https://phab.mercurial-scm.org/D9002

Mercurial evolves over time, some features, options, commands may be replaced by
better and more secure alternatives. This topic will help you migrating your
existing usage and/or configuration to newer features.

Commands
========

The following commands are still available but their use are not recommended:

``locate``

This command has been replaced by `hg files`.

``parents``

This command can be replaced by `hg summary` or `hg log` with appropriate
revsets. See `hg help revsets` for more information.

``tip``

The recommended alternative is `hg heads`.

Options
=======

``web.allowpull``
    Renamed to `allow-pull`.

``web.allow_push``
    Renamed to `allow-push`.