Mercurial > evolve

changeset 1466:a433948ca8d2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Laurent Charignon <lcharignon@fb.com>
date Wed, 24 Jun 2015 16:38:24 -0700
parents 777e5c369d99
children 5c385b812500
files hgext/evolve.py
diffstat 1 files changed, 0 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Mon Jun 29 02:30:27 2015 -0700
+++ b/hgext/evolve.py	Wed Jun 24 16:38:24 2015 -0700
@@ -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)