Mercurial > evolve
view docs/known-doc-issues.rst @ 5561:d6b3f32f8261
evolve: add logic to decide local and other side before merge
Before we perform merge between the two content-divergent csets,
this logic decides which cset would reside at which side i.e.
local or other.
for e.g. in case of public content divergence where one side of
divergence is public, we always keep public one to local side.
(this logic of always keeping public one to local side may change in
future, but for now that's what it is.)
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Thu, 13 Aug 2020 17:22:19 +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