# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1648383672 -10800
# Node ID ff6ea5afba0eef255d493b6a97d7298c460ddefb
# Parent  c834cfede900575f5626919d725b89ff273fcf6c
precheck: update spelling of error messages to match upstream

diff -r c834cfede900 -r ff6ea5afba0e hgext3rd/evolve/rewriteutil.py
--- a/hgext3rd/evolve/rewriteutil.py	Sun Mar 27 15:04:51 2022 +0300
+++ b/hgext3rd/evolve/rewriteutil.py	Sun Mar 27 15:21:12 2022 +0300
@@ -84,7 +84,7 @@
         raise compat.InputError(msg, hint=hint)
     newunstable = disallowednewunstable(repo, revs)
     if newunstable:
-        msg = _(b"%s will orphan %i descendants")
+        msg = _(b"cannot %s changeset, as that will orphan %i descendants")
         msg %= (action, len(newunstable))
         hint = _(b"see 'hg help evolution.instability'")
         raise compat.InputError(msg, hint=hint)
@@ -96,7 +96,7 @@
         local, other, common_prec = divergence
         localdiv = repo[local]
         otherdiv, base = repo[other], repo[common_prec]
-        msg = _(b"%s of %s creates content-divergence "
+        msg = _(b"cannot %s %s, as that creates content-divergence "
                 b"with %s") % (action, localdiv, otherdiv)
         if localdiv.rev() != base.rev():
             msg += _(b', from %s') % base
@@ -104,14 +104,14 @@
                  b"'hg help evolution.instability'")
         if repo.ui.verbose:
             if localdiv.rev() != base.rev():
-                msg += _(b'\n    changeset %s is an evolution of '
+                msg += _(b'\n    changeset %s is a successor of '
                          b'changeset %s') % (localdiv, base)
-            msg += _(b'\n    changeset %s already have a successors as '
+            msg += _(b'\n    changeset %s already has a successor in '
                      b'changeset %s\n'
                      b'    rewriting changeset %s would create '
                      b'"content-divergence"\n'
                      b'    set experimental.evolution.allowdivergence=True to '
-                     b'overwrite this check') % (base, otherdiv, localdiv)
+                     b'skip this check') % (base, otherdiv, localdiv)
             hint = _(b"see 'hg help evolution.instability' for details "
                      b"on content-divergence")
         raise compat.InputError(msg, hint=hint)