Mercurial > evolve
changeset 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 |
| files | docs/troubles-handling.rst |
| diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/troubles-handling.rst Tue Sep 22 13:50:45 2020 +0530 +++ b/docs/troubles-handling.rst Sat Oct 10 22:44:24 2020 +0530 @@ -262,12 +262,19 @@ * they moved on different unrelated branches * divergent changeset can be orphan as well * one side of divergence is in public phase +* divergent changeset is part of a split or fold Details of resolution ===================== Resolution of content-divergence can be understand by dividing it in stages: +Special case: If one of the divergent changeset is part of a split or fold, we don't handle +it right now. But when we are going to support it, it will probably have its own logic and +seperate from generic resolution. + +Generic resolution: + The first stage of solving content-divergence is to find the changeset where the resolution changeset will be based on (which we call the resolution parent or the target parent) and relocate the divergent changesets on the resolution parent, if apply. @@ -282,6 +289,11 @@ .. contents:: :local: +D-S: One of the divergent changeset is part of a split or fold +-------------------------------------------------------------- + +XXX: yet to decide resolution + D-A: Finding the resolution parent ----------------------------------