# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1600334505 -19800
# Node ID 452651e69848a6bec2a4d4c3d737cf791ed85912
# Parent  2f572645b6d5b0b56905adeede72dc927efd5789
evolvecmd: don't set `branchmerge=True` while resolving phase divergence

We are not going to create a merge commit, neither we are using two parents in
any way.

I am unable to see any reason why `branchmerge` should be passed as `True` here.

Passing branchmerge as True leads to side effect of having merge related commit
information stored in mergestate which leads us to having an active mergestate.

diff -r 2f572645b6d5 -r 452651e69848 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Thu Sep 17 18:58:47 2020 +0200
+++ b/hgext3rd/evolve/evolvecmd.py	Thu Sep 17 14:51:45 2020 +0530
@@ -258,7 +258,7 @@
     wctx = context.overlayworkingctx(repo)
     wctx.setbase(prec)
     merge.update(repo, bumped.node(), ancestor=prec, mergeancestor=True,
-                 branchmerge=True, force=False, wc=wctx)
+                 branchmerge=False, force=False, wc=wctx)
     if not wctx.isempty():
         text = b'%s update to %s:\n\n' % (TROUBLES['PHASEDIVERGENT'], prec)
         text += bumped.description()
diff -r 2f572645b6d5 -r 452651e69848 tests/test-evolve-phase-divergence.t
--- a/tests/test-evolve-phase-divergence.t	Thu Sep 17 18:58:47 2020 +0200
+++ b/tests/test-evolve-phase-divergence.t	Thu Sep 17 14:51:45 2020 +0530
@@ -345,7 +345,7 @@
   $ hg glog
   @  5:3d62500c673d phase-divergent update to aa071e5554e3:
   |   (bm) draft
-  %  3:aa071e5554e3 added foo to foo
+  o  3:aa071e5554e3 added foo to foo
   |   () public
   o  1:4d1169d82e47 modify a
   |   () public
@@ -361,10 +361,10 @@
   @  3d62500c673d (5) phase-divergent update to aa071e5554e3:
   |    rewritten(description, parent, content) from d47f2b37ed82 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  %  d47f2b37ed82 (4) added bar to foo
+  x  d47f2b37ed82 (4) added bar to foo
   |    rewritten(description, content) from aa071e5554e3 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  %  aa071e5554e3 (3) added foo to foo
+  o  aa071e5554e3 (3) added foo to foo
   
 
 Syncing all other repositories
@@ -500,7 +500,7 @@
   $ hg glog
   @  8:502e73736632 phase-divergent update to b756eb10ea73:
   |   (bm) draft
-  %  6:b756eb10ea73 added bar to bar
+  o  6:b756eb10ea73 added bar to bar
   |   () public
   o  5:3d62500c673d phase-divergent update to aa071e5554e3:
   |   () public
@@ -788,7 +788,7 @@
   $ hg glog
   @  16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
   |   () draft
-  %  12:dc88f5aa9bc9 y to y and foobar to foo
+  o  12:dc88f5aa9bc9 y to y and foobar to foo
   |   () public
   o  9:2352021b3785 added x to x
   |   (bm) public
@@ -892,7 +892,7 @@
   $ hg glog
   @  21:e3090241a10c phase-divergent update to f3794e5a91dc:
   |   () draft
-  %  17:f3794e5a91dc added l to l
+  o  17:f3794e5a91dc added l to l
   |   () public
   o  16:8c2bb6fb44e9 phase-divergent update to dc88f5aa9bc9:
   |   () public
@@ -1329,7 +1329,7 @@
   $ hg glog --hidden
   @  7:88b0dae5369a phase-divergent update to a51bce62c219:
   |   () draft
-  | %  6:98dad8812511 added n
+  | x  6:98dad8812511 added n
   | |   () draft
   +---o  5:86419909e017 phase-divergent update to a51bce62c219:
   | |     () draft
@@ -1339,7 +1339,7 @@
   | | |/    () draft
   | | x  2:4f25cd9cd2bf added m
   | |/    () draft
-  % |  1:a51bce62c219 added m and n
+  o |  1:a51bce62c219 added m and n
   |/    () public
   o  0:d3873e73d99e init
       () public
@@ -1360,7 +1360,7 @@
   x |  4f25cd9cd2bf (2) added m
   | |    split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
-  | %  98dad8812511 (6) added n
+  | x  98dad8812511 (6) added n
   | |    rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |
   | x  52ca78bb98c7 (4) added n
@@ -1369,7 +1369,7 @@
   | x  e1154ec0206a (3) added n
   |/     split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
   |
-  %  a51bce62c219 (1) added m and n
+  o  a51bce62c219 (1) added m and n
   
 
 XXX: not sure this is correct
@@ -1801,7 +1801,7 @@
   |   IV
   |   V
   |
-  %  changeset:   1:3074c7249d20
+  o  changeset:   1:3074c7249d20
   |  user:        test
   ~  date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     E1
@@ -1842,7 +1842,7 @@
   |    rewritten(description, parent, content) from 599454370881 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   |      (No patch available, changesets rebased)
   |
-  %  599454370881 (2) E2
+  x  599454370881 (2) E2
   |    rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
   |      diff -r 3074c7249d20 -r 599454370881 changeset-description
   |      --- a/changeset-description
@@ -1890,7 +1890,7 @@
   |       V
   |
   |
-  %  3074c7249d20 (1) E1
+  o  3074c7249d20 (1) E1
   
   $ cd ..
 
diff -r 2f572645b6d5 -r 452651e69848 tests/test-evolve-public-content-divergent-corner-cases.t
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Sep 17 18:58:47 2020 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Thu Sep 17 14:51:45 2020 +0530
@@ -151,7 +151,7 @@
   |   c
   |  +cc
   |
-  %  4:c0d7ee6604ea added c
+  o  4:c0d7ee6604ea added c
   |   public
   |
   |  diff -r c9241b0f2d5b -r c0d7ee6604ea c
diff -r 2f572645b6d5 -r 452651e69848 tests/test-evolve-public-content-divergent-main.t
--- a/tests/test-evolve-public-content-divergent-main.t	Thu Sep 17 18:58:47 2020 +0200
+++ b/tests/test-evolve-public-content-divergent-main.t	Thu Sep 17 14:51:45 2020 +0530
@@ -94,7 +94,7 @@
   |   b
   |  +I am second
   |
-  %  2:44f360db368f added b
+  o  2:44f360db368f added b
   |   public
   |
   |  diff -r 9092f1db7931 -r 44f360db368f b
@@ -188,7 +188,7 @@
   @  5:4ae447c511d3 phase-divergent update to 580f2d01e52c:
   |   draft
   |
-  %  2:580f2d01e52c added b
+  o  2:580f2d01e52c added b
   |   public
   |
   o  0:9092f1db7931 added a
diff -r 2f572645b6d5 -r 452651e69848 tests/test-evolve.t
--- a/tests/test-evolve.t	Thu Sep 17 18:58:47 2020 +0200
+++ b/tests/test-evolve.t	Thu Sep 17 14:51:45 2020 +0530
@@ -412,7 +412,7 @@
   $ glog
   @  7:aca219761afb@default(draft) phase-divergent update to 99833d22b0c6:
   |
-  %  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
+  o  5:99833d22b0c6@default(public) another feature (child of ba0ec09b1bab)
   |
   o  4:ba0ec09b1bab@default(public) a nifty feature
   |
diff -r 2f572645b6d5 -r 452651e69848 tests/test-unstability-resolution-result.t
--- a/tests/test-unstability-resolution-result.t	Thu Sep 17 18:58:47 2020 +0200
+++ b/tests/test-unstability-resolution-result.t	Thu Sep 17 14:51:45 2020 +0530
@@ -190,7 +190,7 @@
   |
   | o  7:7bc2f5967f5e@default(draft) bk:[] add c
   | |
-  % |  6:1cf0aacfd363@default(public) bk:[] newer a
+  o |  6:1cf0aacfd363@default(public) bk:[] newer a
   |/
   o  5:66719795a494@default(public) bk:[changea] changea
   |