Mercurial > evolve
changeset 5560:b31cd9ee890a
evolve: add some initial values in evolvestate
This patch adds two values in evolvestate:
evolvestate['relocate-div'] = False
evolvestate['relocate-other'] = False
which will be used by resolution of content-divergence as a flag
to know if we need to relocate the divergent changesets.
In upcoming patches we will remove the logic of swapping
divergent/other (we do this swapping when divergent need to relocate)
as this doesn't seems something solid we can rely on.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Wed, 05 Aug 2020 14:25:29 +0530 |
| parents | eb09d05f69f3 |
| children | d6b3f32f8261 |
| files | hgext3rd/evolve/evolvecmd.py |
| diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Wed Aug 05 14:19:29 2020 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Wed Aug 05 14:25:29 2020 +0530 @@ -479,6 +479,8 @@ # strip that relocated commit. However if `--all` is passed, we need to # reset this value for each content-divergence resolution which we are doing # below. + evolvestate[b'relocate-div'] = False + evolvestate[b'relocate-other'] = False evolvestate[b'relocated-other'] = None evolvestate[b'relocating-other'] = False evolvestate[b'relocated-div'] = None