--- a/hgext3rd/evolve/evolvecmd.py Sat Apr 27 17:11:12 2019 +0800
+++ b/hgext3rd/evolve/evolvecmd.py Fri Apr 26 01:20:08 2019 +0530
@@ -558,12 +558,12 @@
def _mergecontentdivergents(repo, progresscb, divergent, other, base,
evolvestate):
if divergent not in repo[None].parents():
- repo.ui.status(_("updating to \"local\" side of the conflict: %s\n") %
- divergent.hex()[:12])
+ repo.ui.note(_("updating to \"local\" side of the conflict: %s\n") %
+ divergent.hex()[:12])
hg.updaterepo(repo, divergent.node(), False)
# merging the two content-divergent changesets
- repo.ui.status(_("merging \"other\" %s changeset '%s'\n") %
- (TROUBLES['CONTENTDIVERGENT'], other.hex()[:12]))
+ repo.ui.note(_("merging \"other\" %s changeset '%s'\n") %
+ (TROUBLES['CONTENTDIVERGENT'], other.hex()[:12]))
if progresscb:
progresscb()
mergeancestor = repo.changelog.isancestor(divergent.node(), other.node())