Mercurial > evolve
diff docs/troubles-handling.rst @ 5484:e3302ad5ad77
unstable-list: add the basic about orphan changesets
The goal of this part is to quickly explain orphan and main idea behind its
resolution.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 14 Aug 2020 18:08:48 +0200 |
| parents | e82d336bf31e |
| children | 457d8003e840 |
line wrap: on
line diff
--- a/docs/troubles-handling.rst Fri Aug 14 17:59:51 2020 +0200 +++ b/docs/troubles-handling.rst Fri Aug 14 18:08:48 2020 +0200 @@ -22,6 +22,14 @@ Basics ****** +A changeset is orphan when there is at least one obsolete ancestor. + +As a resolution, we need to find a new appropriate parents for the +changeset and rebase the orphan there. + +If the parents of an orphan changeset are orphan themself, they will have to be +"stabilised" fist. + Cause of trouble ****************