Mercurial > evolve

comparison docs/troubles-handling.rst @ 5583:72a4aa791d97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unstable-list: some minor updates
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 10 Oct 2020 14:04:02 +0530
parents c408a31d8883
children 7f9149ccbf42
comparison
equal deleted inserted replaced
5582:041024be2163 5583:72a4aa791d97
114 **Current Support Level** 114 **Current Support Level**
115 115
116 O-A4: parent is split into multiple successors 116 O-A4: parent is split into multiple successors
117 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 117 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
118 118
119 O-A4.1: successors of parent are all one the same topological branch 119 O-A4.1: successors of parent are all on the same topological branch
120 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" 120 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
121 121
122 122
123 **Stabilisation Strategy** 123 **Stabilisation Strategy**
124 124
169 It appears when a rewritten changeset got published. A phase-divergent changeset 169 It appears when a rewritten changeset got published. A phase-divergent changeset
170 has a public predecessor. 170 has a public predecessor.
171 171
172 Solving phase divergence is done by extracting the changes made between the 172 Solving phase divergence is done by extracting the changes made between the
173 public predecessors and the latest evolution of the changesets into a new 173 public predecessors and the latest evolution of the changesets into a new
174 changesets, descendants of the public prédecessors. 174 changesets, descendants of the public predecessors.
175 175
176 Cause of trouble 176 Cause of trouble
177 ================ 177 ================
178 178
179 It can appear if a user locally change the phase of an obsolete changeset 179 It can appear if a user locally change the phase of an obsolete changeset
233 Source of Complexity 233 Source of Complexity
234 ==================== 234 ====================
235 235
236 236
237 Before we perform a 3-way merge between the divergent changesets and common 237 Before we perform a 3-way merge between the divergent changesets and common
238 predecessor as base, there are some situations we need to take care of, like: 238 predecessor (which acts as the 3-way merge base), there are some situations we need to take care of, like:
239 239
240 * if divergent changesets moved, check which side moved in which direction, 240 * if divergent changesets moved, check which side moved in which direction,
241 and proceed accordingly 241 and proceed accordingly
242 * they moved on different unrelated branches 242 * they moved on different unrelated branches
243 * divergent changeset can be orphan as well 243 * divergent changeset can be orphan as well