# HG changeset patch # User Angel Ezquerra # Date 1398803148 -7200 # Node ID b2b3d5aa16bc8f1f197e75dc68cbb8027f1dca0c # Parent 9a6cc7e6f0dd20a6b40ef5d5da9b00e36b3ca9a2 evolve: start all util.Abort messages with lower case diff -r 9a6cc7e6f0dd -r b2b3d5aa16bc hgext/evolve.py --- a/hgext/evolve.py Tue Apr 29 22:25:35 2014 +0200 +++ b/hgext/evolve.py Tue Apr 29 22:25:48 2014 +0200 @@ -1196,11 +1196,11 @@ "| \n" "| You should contact your local evolution Guru for help.\n" % (divergent, othersstr)) - raise util.Abort("We do not handle divergence with split yet", + raise util.Abort("we do not handle divergence with split yet", hint='') other = others[0] if divergent.phase() <= phases.public: - raise util.Abort("We can't resolve this conflict from the public side", + raise util.Abort("we can't resolve this conflict from the public side", hint="%s is public, try from %s" % (divergent, other)) if len(other.parents()) > 1: raise util.Abort("divergent changeset can't be a merge (yet)",