# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1603913066 -3600
# Node ID eb326644dc296371b85fdf9f7d2418ef293df223
# Parent  87966baf6ea96c1199b208330ef9c9c06207da1d# Parent  5673730db8d54e629d927311f1083b72581ad9e0
branching: merge stable into default

diff -r 87966baf6ea9 -r eb326644dc29 hgext3rd/evolve/cmdrewrite.py
diff -r 87966baf6ea9 -r eb326644dc29 hgext3rd/evolve/evolvecmd.py
--- a/hgext3rd/evolve/evolvecmd.py	Sun Oct 25 21:38:37 2020 +0800
+++ b/hgext3rd/evolve/evolvecmd.py	Wed Oct 28 20:24:26 2020 +0100
@@ -629,6 +629,7 @@
             # 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):
diff -r 87966baf6ea9 -r eb326644dc29 hgext3rd/evolve/rewind.py
diff -r 87966baf6ea9 -r eb326644dc29 hgext3rd/topic/__init__.py
diff -r 87966baf6ea9 -r eb326644dc29 tests/test-evolve-progress.t
diff -r 87966baf6ea9 -r eb326644dc29 tests/test-evolve-public-content-divergent-discard.t
--- a/tests/test-evolve-public-content-divergent-discard.t	Sun Oct 25 21:38:37 2020 +0800
+++ b/tests/test-evolve-public-content-divergent-discard.t	Wed Oct 28 20:24:26 2020 +0100
@@ -509,6 +509,7 @@
 
   $ 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 @@
 
   $ hg par
   changeset:   5:e800202333a4
+  tag:         tip
   parent:      2:155349b645be
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000