##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict...
rebase: teach in-memory rebase to not restart with on-disk rebase on conflict When in-memory rebase runs into conflicts, it redoes the whole rebase operation. This patch teaches it to instead discard just the current `overlayworkingctx` and redo that node on disk. I've tested this by enabling in-memory rebase by default and checking that there are no unexpected differences after this patch. The next step is to make it so that `hg rebase --continue` can use in-memory merge. Differential Revision: https://phab.mercurial-scm.org/D9076
Matt Harbison - - Load All Authors

File last commit:

r44031:2e017696 default
r46132:feffeb18 default
Show More
deprecated.txt
30 lines | 678 B | text/plain | TextLexer
/ mercurial / helptext / deprecated.txt
History | Source | Raw |Copy content |Copy permalink
Matt Harbison
help: create packages for the help text...
 r44031 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`.