On Fri, Jun 02, 2023 at 04:27:37PM +0200, Dmitry Belyavskiy wrote:
Dear colleagues,
I maintain OpenSSH that has a lot of heavy-interfering downstream
patches. I’d like to reduce the burden of rebase by combining some of
them.
Trying to reduce the burden by combining patches won't help IMHO, and
if anything make life worse, as any patch failing to apply will leave
a bigger conflict mess to resolve. I always favour a larger number of
small patches, over a small number of big patches.
So I wonder if there is software checking for cross-dependencies
between patches to see what are the natural candidates for combining?
I’m aware of quilt and git-absorb but it looks like they don’t help me much.
Are you primarily using dist-git and managing the patches manually ?
It looks like it, since the paches I see in openssh.git aren't git
commit exports.
If so, I'd highly recommend switching to using a src-git model instead,
where you manage a Fedora branch of commits directly against the upstream
git repo. This lets you exploit the full power of git for rebasing and
cherry-picking patches and resolving conflicts. dist-git largely becomes
an export of patches from the src-git branch which is largely automatable.
I'm not saying src-git is a magic bullet, just that it is much less painful
that directly working on dist-git.
With regards,
Daniel
--
|:
https://berrange.com -o-
https://www.flickr.com/photos/dberrange :|
|:
https://libvirt.org -o-
https://fstop138.berrange.com :|
|:
https://entangle-photo.org -o-
https://www.instagram.com/dberrange :|