Mercurial > evolve

diff tests/test-unstability-resolution-result.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 baa0b481eec5
children 98e2613d797d
line wrap: on
line diff
--- 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
   |