[PATCH] commit: block amend while histedit is in progress (issue4800)

Pierre-Yves David pierre-yves.david at ens-lyon.org
Sun Feb 14 13:14:15 EST 2016



On 02/14/2016 07:36 AM, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 1455435350 0
> #      Sun Feb 14 07:35:50 2016 +0000
> # Node ID 800740823f9d3c5ac6cd349139405b83e35d5da9
> # Parent  a036e1ae1fbe88ab99cb861ebfc2e4da7a3912ca
> commit: block amend while histedit is in progress (issue4800)
>
> Currently histedit gets confused if an amend happens while histedit
> is in progress. Since we have a checkunfinished command, we are
> temporarily honoring it.
>
> Note: eventually this guard will be removed. Please do not expect
> this behavior to remain.

This seems a sensible reaction until we have a better fix. But this is 
quite a usuability bummer as, for example it will prevent people to 
amend their -new- commit during an edit.

I'm CCing Kostia who is working on a fix for issue4800. Maybe it will be 
ready soon enough so that we don't need this patch ?

As more long terms vision, we should probably grow "checkrewrite" that 
would check if it sensible to rewrite a changeset or not.|


-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list