This instance was upgraded to Heptapod 0.27.2 on 2021-12-08 at 22:00 UTC+1

Commit d1d53f12 authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

branching: merge stable into default

Pipeline #12242 passed with stage
in 4 minutes and 18 seconds
......@@ -629,6 +629,7 @@ def _completecontentdivergent(ui, repo, progresscb, divergent, other,
# no changes, create markers to resolve divergence
obsolete.createmarkers(repo, [(otherdiv, (publicdiv,))],
operation=b'evolve')
compat.mergestate.clean(repo)
return (True, publicnode)
with repo.dirstate.parentchange(), compat.parentchange(repo):
......
......@@ -509,6 +509,7 @@ Testing when different parent, merging conflict:
$ hg par
changeset: 5:e800202333a4
tag: tip
parent: 2:155349b645be
user: test
date: Thu Jan 01 00:00:00 1970 +0000
......@@ -626,6 +627,7 @@ Testing when different parent, conflict in relocation and merging:
$ hg par
changeset: 5:e800202333a4
tag: tip
parent: 2:155349b645be
user: test
date: Thu Jan 01 00:00:00 1970 +0000
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment