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

Sean Farley sean at farley.io
Tue Mar 1 01:03:41 EST 2016


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 659b861a64310683c65d776ab137492716513b30
> # Parent  41dcd754526612c43b9695df8851557c851828ef
> histedit: improve error when run on nodes with children (issue5056)
>
> diff -r 41dcd7545266 -r 659b861a6431 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,8 @@ 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(_('can only histedit a changeset together '
> +                                'with all descendants'))

I like this wording much better.


More information about the Mercurial-devel mailing list