From: Christian Weisgerber <naddy@mips.inka.de>
Subject: Re: histedit: How to fold M, D?
To: gameoftrees@openbsd.org
Date: Mon, 24 Jul 2023 15:40:48 +0200

Christian Weisgerber:

> Commit 1: Change some files.
> Commit 2: Delete some of those files.
> 
> How do I fold those two commits into one?

I have found a solution:

Start histedit, "edit" commit 1.

When histedit interrupts, "got rv" the files in question, then "got rm"
them.  Continue the histedit operation.

When histedit stops with "Files which had incoming changes but could
not be found in the work tree", just continue again.

The histedit operation concludes successfully, and you now have
revised commits 1a and 2a, where the deletion of the files has moved
from old commit 2 to new commit 1a.

You can now perform another histedit run and fold commit 1a into 2a.

Phew.

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de