Mercurial > evolve
changeset 5494:ac7cb1b67c9b
unstable-list: simplify the basic
The point of the "basics" section is to summarize the semantic of the
unstability and its resolution, not to get into details. Details are meant for
the other sections.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 26 Aug 2020 11:51:14 +0200 |
| parents | 1a7bb3ab027e |
| children | d3cf24afa620 |
| files | docs/troubles-handling.rst |
| diffstat | 1 files changed, 3 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/troubles-handling.rst Mon Aug 17 16:44:13 2020 +0530 +++ b/docs/troubles-handling.rst Wed Aug 26 11:51:14 2020 +0200 @@ -169,18 +169,9 @@ It appears when a rewritten changeset got published. A phase-divergent changeset has a public predecessor. -To stabilise the situation, we need to analyse the changes introduced by the -phase-divergent changeset which succeeded the public changeset. And if there -are some file content changes which can be rebased on public changeset, will be -committed as a resolution changeset. - -If no file content changes and only metadata (author, parent, etc) is changed, -we prune phase-divergent changeset. -XXX: here we should probably inform about the metadata loss. - -In practice there are other corner cases where this is "not that simple". -For e.g. the obsolete changeset (which got published) was split over multiple -topological branches. +Solving phase divergence is done by extracting the changes made between the +public predecessors and the latest evolution of the changesets into a new +changesets, descendants of the public prédecessors. Cause of trouble ****************