Mercurial > evolve
view docs/known-doc-issues.rst @ 5011:04104042c6ad
evolve: delete redundant and incorrect code for updating dirstate
In relocate() when we notice conflicts, we will try to fix up the
dirstate by calling copies.duplicatecopies() and
dirstatedance(). However, we had called _evolvemerge() just before
that point and that has already fixed up the dirstate, so there's no
need to do it again. Also, we did it incorrectly as the test case
shows.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 19 Nov 2019 14:54:13 -0800 |
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