Mercurial > evolve
view docs/known-doc-issues.rst @ 3809:f06ff8fee2f6
evolvestate: store info about relocation while resolving content-divergence
While resolving content-divergence when they are on different parents, we
relocate one of the node to parent of another one and this can lead to conflicts
sometimes. So we need to store information about that state in evolvestate so
that we can use that when user does `hg evolve --continue` or `--stop` or
`--abort`.
Now that we make sure, we store the new other node in evolvestate, we fix the
behavior of handling the relocated commit and merge the right changesets.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 07 Jun 2018 18:18:10 +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