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

Piotr Listkiewicz piotr.listkiewicz at gmail.com
Mon Feb 29 18:11:28 EST 2016


>
> There's an important distinction between histedit and amend, in that
> histedit works on a whole stack of changes at once, whereas amend only
> works on one at a time. That is, if you have a history graph like this:
>
> 1 - 2 - 3 - 4
>          \------5
> and you try to do 'hg amend' on 3, there are two children that prevent
> that from happening. However, if you're on 4 and try to do 'hg histedit 3',
> that's still illegal (without evolution) because if revision 3 gets
> rewritten it would orphan revision 5. As a result, I think the histedit
> wording needs to be a little different. Does that make sense?


Yes, thats totally make sense to me

2016-03-01 0:06 GMT+01:00 Augie Fackler <raf at durin42.com>:

>
> > On Feb 29, 2016, at 13:23, Kostia Balytskyi <ikostia at fb.com> wrote:
> >
> > "can only histedit a changeset together with descendants" ?
>
>
> Sounds good. I'd add the word "all" before descendants to try and
> emphasize that point, but that's all I'd change.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20160301/611c90eb/attachment.html>


More information about the Mercurial-devel mailing list