Mercurial > evolve

changeset 5620:eb326644dc29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge stable into default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 28 Oct 2020 20:24:26 +0100
parents 87966baf6ea9 (current diff) 5673730db8d5 (diff)
children 87ee065a688b
files hgext3rd/evolve/cmdrewrite.py hgext3rd/evolve/evolvecmd.py hgext3rd/evolve/rewind.py hgext3rd/topic/__init__.py tests/test-evolve-progress.t tests/test-evolve-public-content-divergent-discard.t
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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):
--- 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