Re: per-topic or per-file patches (was: pkgquilt)

Rhialto <[email protected]> Tue, 16 Jun 2026 18:29:21 +0200

Newsgroups	gmane.os.netbsd.devel.packages
Message-ID	<[email protected]>

On Mon 15 Jun 2026 at 11:28:34 -0700, Greg A. Woods wrote:
> The tool I use is "magit" in Emacs.  It makes it relatively trivial to
> scan through a set of all current diffs across all files and then to
> stage individual "hunks" to make a commit.

You might like jujutsu (devel/jj) as well then. It uses git as storage
but has a different view on the mutability of history. It has fairly
good tools to move changes from one commit to another. An apparently
fairly common workflow is that someone first pre-creates one or more
topic-based commits that start out empty. Then a "scratchpad" commit
comes after that, where changes collect as they are made.  These changes
can then be moved to the commit where they belong.
I read it has borrowed some of these ideas from Mercurial, but I haven't
used that much yet so I can't tell.

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert                            <rhialto/at/falu.nl>
\X/ There is no AI. There is just someone else's work.           --I. Rose

signature.asc (application/pgp-signature, 525 B)