# HG changeset patch # User Laurent Charignon # Date 1435189104 25200 # Node ID a433948ca8d29d5bc518fe58b77cee25e756125b # Parent 777e5c369d9988d1518865cf74e536b35bba445e evolve: remove unused warning message in _solvedivergent Before this patch, we were checking for a case where a divergent changeset could be public and printing a warning in that case. When we compute the divergent set in the obsolete module we explicitely look for not public() changesets. This patch removes this unused warning. diff --git a/hgext/evolve.py b/hgext/evolve.py --- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -1849,12 +1849,6 @@ ui.write_err(msg) return 2 other = others[0] - if divergent.phase() <= phases.public: - msg = _("skipping %s: we can't resolve divergence from the public side\n") % divergent - ui.write_err(msg) - hint = _("(%s is public, try from %s)\n" % (divergent, other)) - ui.write_err(hint) - return 2 if len(other.parents()) > 1: msg = _("skipping %s: divergent changeset can't be a merge (yet)\n" % divergent) ui.write_err(msg)