Mercurial > evolve
changeset 5498:f5d44464d72e
unstable-list: expand and clarify the source of complexity for phase-div
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 26 Aug 2020 12:03:32 +0200 |
| parents | e7b70fe1297a |
| children | fb5a675f9676 |
| files | docs/troubles-handling.rst |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/troubles-handling.rst Tue Aug 18 08:47:15 2020 +0530 +++ b/docs/troubles-handling.rst Wed Aug 26 12:03:32 2020 +0200 @@ -189,8 +189,9 @@ ******************** * public version is a merge -* phase-divergent (bumped) changeset is a merge -* changeset was split (linear, over multiple topo branches) +* phase-divergent changeset is a merge +* public version was split (linear, over multiple topo branches, etc…) +* phase-divergent version was folded with others * rebasing might lead to conflict. Details of Sub cases