Mercurial > evolve

diff tests/test-evolve.t @ 5539:452651e69848 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 17 Sep 2020 14:51:45 +0530
parents 1b5afe8bb26a
children 98e2613d797d
line wrap: on
line diff
--- 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
   |