# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1596617729 -19800
# Node ID b31cd9ee890a4797601538870f8fd78ab74fc043
# Parent  eb09d05f69f38a10d639566a6b0f08eaf3c7c482
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.

diff -r eb09d05f69f3 -r b31cd9ee890a hgext3rd/evolve/evolvecmd.py
--- 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