evolve merge requestshttps://foss.heptapod.net/mercurial/evolve/-/merge_requests2020-08-25T08:05:21Zhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/222compatibility with cmdutil.revert() without parents2020-08-25T08:05:21ZAnton Shestakovcompatibility with cmdutil.revert() without parentsNot sure about the last commit (split command), but the tests are passing.Not sure about the last commit (split command), but the tests are passing.Pierre-Yves DavidPierre-Yves Davidhttps://foss.heptapod.net/mercurial/evolve/-/merge_requests/244evolvecmd: don't set `branchmerge=True` while resolving phase divergence2020-09-19T16:25:31ZPulkit Goyalevolvecmd: don't set `branchmerge=True` while resolving phase divergenceWe 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 r...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.Pierre-Yves DavidPierre-Yves David