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

Augie Fackler raf at durin42.com
Tue Mar 1 13:42:23 EST 2016


On Tue, Mar 01, 2016 at 07:18:26AM +0100, liscju wrote:
> # HG changeset patch
> # User liscju <piotr.listkiewicz at gmail.com>
> # Date 1456755146 -3600
> #      Mon Feb 29 15:12:26 2016 +0100
> # Node ID e8daf8d45d2cc6cc95352ed7255f0f9090bbbea9
> # Parent  41dcd754526612c43b9695df8851557c851828ef
> histedit: improve error when run on nodes with children (issue5056)

This is queued, thanks.

>
> diff -r 41dcd7545266 -r e8daf8d45d2c 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 its descendants'))
>          if repo.revs('(%ld) and merge()', ctxs):
>              raise error.Abort(_('cannot edit history that contains merges'))
>          root = ctxs[0] # list is already sorted by repo.set
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list