Mercurial > evolve
comparison docs/troubles-handling.rst @ 5486:381df06460e8
unstable-list: add list the source of complexity during resolution
All I and Sushil could think about.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 14 Aug 2020 18:10:10 +0200 |
| parents | 457d8003e840 |
| children | 7c543787d5c6 |
comparison
equal
deleted
inserted
replaced
| 5485:457d8003e840 | 5486:381df06460e8 |
|---|---|
| 41 obsolescence information of the ancestors is pulled in the local repository. | 41 obsolescence information of the ancestors is pulled in the local repository. |
| 42 | 42 |
| 43 Source of Complexity | 43 Source of Complexity |
| 44 ******************** | 44 ******************** |
| 45 | 45 |
| 46 There can be different situations we need to take care of when dealing with | |
| 47 resolution of an orphan changeset, like: | |
| 48 | |
| 49 * parents might not be obsolete (yet) and orphan themself. They will need to be | |
| 50 resolved first. | |
| 51 * obsolete parent has conflicting rewrites (content-divergence), so there might | |
| 52 not be an obvious "good spot" to rebase the changeset too. | |
| 53 * obsolete parent could have been prune, so it has not direct successors, | |
| 54 * obsolete parent was split in multiple changesets. This comes with multiple | |
| 55 variants: | |
| 56 * successors could be linear of spread accross multiple branches, | |
| 57 * successors could have been reordered after the initial split, | |
| 58 * Some of the successors could have been pruned. | |
| 59 * the orphan changeset can be a merge and orphan may come any numbers of parents | |
| 60 * rebasing might lead to conflict. | |
| 61 | |
| 46 Details of Sub cases | 62 Details of Sub cases |
| 47 ******************** | 63 ******************** |
| 48 | 64 |
| 49 Phase-Divergence | 65 Phase-Divergence |
| 50 ################## | 66 ################## |