From: Omar Polo <op@omarpolo.com>
Subject: Re: fix histedit -e bug
To: Stefan Sperling <stsp@stsp.name>
Cc: gameoftrees@openbsd.org
Date: Tue, 11 Jun 2024 18:29:06 +0200

On 2024/06/11 14:46:37 +0200, Stefan Sperling <stsp@stsp.name> wrote:
> histedit -e has a bug if all changes are reverted after a merge conflict.
> 
> Running histedit -c after reverting conflicts will correctly report a no-op
> change, indicating the commit will be dropped. However, the commit is not
> marked as skipped in histedit meta data. The next time histedit -c runs
> the same commit will be merged again, and conflict again.
> This results in a revert + histedit -c cycle that can only be broken out
> of with histedit -a.
>  
> Fix and regression test below -- undo the fix to see the test fail.
> 
> OK?

ok op@