Mercurial > evolve
comparison docs/troubles-handling.rst @ 5489:8b7036384f77
unstable-list: more entry for orphan SPLIT ME
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 14 Aug 2020 18:04:22 +0200 |
| parents | 9920e8b4756d |
| children | 8f9dd2414416 |
comparison
equal
deleted
inserted
replaced
| 5488:9920e8b4756d | 5489:8b7036384f77 |
|---|---|
| 96 | 96 |
| 97 Current Support Level | 97 Current Support Level |
| 98 """"""""""""""""""""" | 98 """"""""""""""""""""" |
| 99 | 99 |
| 100 Good support if there they are only one head to the set | 100 Good support if there they are only one head to the set |
| 101 | |
| 102 O-A3: parent has multiple successors sets | |
| 103 ----------------------------------------- | |
| 104 | |
| 105 Stabilisation Strategy | |
| 106 """""""""""""""""""""" | |
| 107 | |
| 108 Current Support Level | |
| 109 """"""""""""""""""""" | |
| 110 | |
| 111 O-A4: parent is split into multiple successors | |
| 112 ---------------------------------------------- | |
| 113 | |
| 114 O-A4.1: parent are all one the same topological branch | |
| 115 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
| 116 | |
| 117 Stabilisation Strategy | |
| 118 """""""""""""""""""""" | |
| 119 pick highest one as resolution parent if all the succs are in a single topo branch | |
| 120 | |
| 121 Current Support Level | |
| 122 """"""""""""""""""""" | |
| 123 | |
| 124 O-A4.2: parent is split into multiple successors | |
| 125 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | |
| 126 | |
| 127 In this case, the destination can be ambiguous | |
| 128 | |
| 129 Stabilisation Strategy | |
| 130 """""""""""""""""""""" | |
| 131 | |
| 132 prompt user to choose one | |
| 133 | |
| 134 (could we do better in some case?) | |
| 135 | |
| 136 Current Support Level | |
| 137 """"""""""""""""""""" | |
| 138 | |
| 139 | |
| 140 Stabilisation Strategy | |
| 141 """""""""""""""""""""" | |
| 142 , otherwise prompt user to choose one | |
| 143 | |
| 144 | |
| 145 | |
| 146 Current Support Level | |
| 147 """"""""""""""""""""" | |
| 148 | |
| 149 O-M: Parent are Merge (multiple parent) | |
| 150 ======================================= | |
| 151 | |
| 152 O-M1: Only one parent is obsolete | |
| 153 --------------------------------- | |
| 154 | |
| 155 XXX Simple case are probably as good as any `O-A` case. However special case are | |
| 156 probably ignored right now (eg: successors of the obsolete parent is linear with | |
| 157 the other parent). | |
| 158 | |
| 159 O-M2: both parent are obsolete | |
| 160 ------------------------------ | |
| 161 | |
| 162 XXX currently we evolve one after the other. | |
| 163 | |
| 101 Phase-Divergence | 164 Phase-Divergence |
| 102 ################## | 165 ################## |
| 103 | 166 |
| 104 Basics | 167 Basics |
| 105 ****** | 168 ****** |