Mercurial > evolve
comparison docs/troubles-handling.rst @ 5588:5cbb1f356137
unstable-list: add split and fold in content-divergence resolution
This patch adds the current status of divergence resolution when one of
the divergent changeset is a part of split or fold.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sat, 10 Oct 2020 22:44:24 +0530 |
| parents | c2e71fc0efeb |
| children | cbc886623dc1 |
comparison
equal
deleted
inserted
replaced
| 5587:c2e71fc0efeb | 5588:5cbb1f356137 |
|---|---|
| 260 * if divergent changesets moved, check which side moved in which direction, | 260 * if divergent changesets moved, check which side moved in which direction, |
| 261 and proceed accordingly | 261 and proceed accordingly |
| 262 * they moved on different unrelated branches | 262 * they moved on different unrelated branches |
| 263 * divergent changeset can be orphan as well | 263 * divergent changeset can be orphan as well |
| 264 * one side of divergence is in public phase | 264 * one side of divergence is in public phase |
| 265 * divergent changeset is part of a split or fold | |
| 265 | 266 |
| 266 Details of resolution | 267 Details of resolution |
| 267 ===================== | 268 ===================== |
| 268 | 269 |
| 269 Resolution of content-divergence can be understand by dividing it in stages: | 270 Resolution of content-divergence can be understand by dividing it in stages: |
| 271 | |
| 272 Special case: If one of the divergent changeset is part of a split or fold, we don't handle | |
| 273 it right now. But when we are going to support it, it will probably have its own logic and | |
| 274 seperate from generic resolution. | |
| 275 | |
| 276 Generic resolution: | |
| 270 | 277 |
| 271 The first stage of solving content-divergence is to find the changeset where the resolution | 278 The first stage of solving content-divergence is to find the changeset where the resolution |
| 272 changeset will be based on (which we call the resolution parent or the target parent) and | 279 changeset will be based on (which we call the resolution parent or the target parent) and |
| 273 relocate the divergent changesets on the resolution parent, if apply. | 280 relocate the divergent changesets on the resolution parent, if apply. |
| 274 | 281 |
| 280 ==================== | 287 ==================== |
| 281 | 288 |
| 282 .. contents:: | 289 .. contents:: |
| 283 :local: | 290 :local: |
| 284 | 291 |
| 292 D-S: One of the divergent changeset is part of a split or fold | |
| 293 -------------------------------------------------------------- | |
| 294 | |
| 295 XXX: yet to decide resolution | |
| 296 | |
| 285 D-A: Finding the resolution parent | 297 D-A: Finding the resolution parent |
| 286 ---------------------------------- | 298 ---------------------------------- |
| 287 | 299 |
| 288 This section is responsible to decide where the resultant changeset should live. If it's unable to | 300 This section is responsible to decide where the resultant changeset should live. If it's unable to |
| 289 find the resolution parent, we abort the content-divergence resolution. Following are the possible | 301 find the resolution parent, we abort the content-divergence resolution. Following are the possible |