# HG changeset patch
# User Sushil khanchi <sushilkhanchi97@gmail.com>
# Date 1598868331 -19800
# Node ID 5f2c85ea8b337832821b64a96cf4f2af6c55af03
# Parent  ca45afafd94f8380e9c742bf1a5783561a359269
evolve: set other side of public content div using mutability

In upcoming behavior we will no longer be confident that
evovlestate['other-divergent'] will always contain the
mutable side of public content divergence since we won't
swap the "divergent" and "other" cset (the swapping is used
right now when "divergent" side need to relocate, because
we keep the one which need relocation to `other` side)

diff -r ca45afafd94f -r 5f2c85ea8b33 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Mon Aug 31 15:34:12 2020 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Aug 31 15:35:31 2020 +0530
@@ -628,8 +628,7 @@
         haspublicdiv = True
         publicnode = evolvestate[b'public-divergent']
         publicdiv = repo[publicnode]
-        othernode = evolvestate[b'other-divergent']
-        otherdiv = repo[othernode]
+        otherdiv = other if other.mutable() else divergent
 
         with repo.dirstate.parentchange(), compat.parentchange(repo):
             cmdrewrite.movedirstate(repo, repo[publicnode])