Mercurial > evolve
changeset 5490:8f9dd2414416
unstable-list: add basic description of content divergence
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 14 Aug 2020 18:05:33 +0200 |
| parents | 8b7036384f77 |
| children | 1a238a9313da |
| files | docs/troubles-handling.rst |
| diffstat | 1 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/troubles-handling.rst Fri Aug 14 18:04:22 2020 +0200 +++ b/docs/troubles-handling.rst Fri Aug 14 18:05:33 2020 +0200 @@ -182,6 +182,19 @@ Basics ****** + +Independent rewrites of same changeset leads to content-divergence. So an +obsolete changeset have multiple "sets" of successors. And the content-divergent +changeset have some predecessors in common without the situation being the +result of a split. + +To stabilise the situation, we need to "merge" the change introduced in each +side of the divergence and create a new changeset, that will superceed both the +of unstable one. The merged information can we both about file content and +metadata (author, parent, etc). + +In practice there are a lot of corner case where this is "not that simple". + Cause of trouble ****************