[PATCH] histedit: improve error msg when run on nodes with children (issue5056)

[Sean Farley]

liscju <piotr.listkiewicz at gmail.com> writes:

> # HG changeset patch
> # User liscju <piotr.listkiewicz at gmail.com>
> # Date 1456755146 -3600
> #      Mon Feb 29 15:12:26 2016 +0100
> # Node ID 6fbd67c792b907efa62a7b36832921483f2d8e38
> # Parent  41dcd754526612c43b9695df8851557c851828ef
> histedit: improve error msg when run on nodes with children (issue5056)
>
> diff -r 41dcd7545266 -r 6fbd67c792b9 hgext/histedit.py
> --- a/hgext/histedit.py	Wed Feb 24 15:55:44 2016 -0600
> +++ b/hgext/histedit.py	Mon Feb 29 15:12:26 2016 +0100
> @@ -1282,7 +1282,7 @@ def between(repo, old, new, keep):
>      if ctxs and not keep:
>          if (not obsolete.isenabled(repo, obsolete.allowunstableopt) and
>              repo.revs('(%ld::) - (%ld)', ctxs, ctxs)):
> -            raise error.Abort(_('cannot edit history that would orphan nodes'))
> +            raise error.Abort(_('cannot histedit changeset with children'))

To my ear, this doesn't quite sound right. I'm a little at a lost for
better wording, though.