Mercurial > evolve
changeset 5493:1a7bb3ab027e
unstable-list: add basic section for phase-divergence
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Mon, 17 Aug 2020 16:44:13 +0530 |
| parents | 76963e896ea6 |
| children | ac7cb1b67c9b |
| files | docs/troubles-handling.rst |
| diffstat | 1 files changed, 17 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/troubles-handling.rst Mon Aug 17 13:47:52 2020 +0530 +++ b/docs/troubles-handling.rst Mon Aug 17 16:44:13 2020 +0530 @@ -165,6 +165,23 @@ Basics ****** + +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. + Cause of trouble ****************