Mercurial > evolve
view docs/known-doc-issues.rst @ 3738:ed3f69fb67bf
evolve: fix the conflicts error message during content-divergence resolution
Before last patch, we didn't had an automated way to continue an interrupted
content-divergence resolution and we used to show a very long error message on
how to continue manually.
This patch replaces that long error message with nice small message which tells
how to continue and how to abort. We still show `hg update -C .` to abort as we
need to test and make `--abort` work in case of content-divergence.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2018 19:04:18 +0530 |
| parents | f98f3f62f8c4 |
| children |
line wrap: on
line source
.. Copyright © 2017 Pierre-Yves David <pierre-yves.david@octobus.net> ============================================== Known limitations of the current documentation ============================================== Features not covered by tutorials ================================= Some of the *newer* features of evolution might not be reflected in the documentation yet. You can directly check the inline documentation of the extension itself for fresher details using `hg help -e evolve`. Known undocumented features are: * `hg prev`, * `hg next`, * `hg next --evolve`, * `hg evolve --rev`, * `hg evolve --list`, * `hg obslog`, * `hg split`, * `hg metaedit`, * `hg touch`, * `hg amend --extract`, * `hg pdiff`, * `hg pstatus`, * `hg amend -i`, * various topic related elements (in particular `hg stack`), Unreferenced Documents ====================== There are documents with content not linked in the flow of the main documentation. Some might be outdated and some are too fresh to be integrated in the main flow yet. .. toctree:: :maxdepth: 1 evolve-faq evolve-good-practice obs-terms tutorials/topic-tutorial tutorials/tutorial