On Fri, 17 Apr 2026, Michael Van Canneyt via fpc-devel wrote:
----------
But the core idea (if that does not already happen?):
When a commit makes it into main, decide then and there if that commit
may (maybe) go into any fixes branch. (does not cover any dependencies,
just the commits that of their own accord want to be in fixes).
-> hence the milestone. when you create the MR, you decide if it is
'merge-worthy' and add the milestone. Later on you have 99% of your list for
free.
I was wondering why there is so much resistance to this idea, why people
think it is cumbersome.
There is a detail that is maybe unknown to erstwhile SVN users:
When you look at a MR that was merged to devel, there is a link 'Cherry pick'
in the MR gitlab page. This will let you merge all commits of the MR to
another branch (fixes or any other).
This literally lets you merge a MR to another branch with some clicks.
No need for checkouts, merging manually, pushing etc.
It can be done when a MR was just merged to devel, or can be done later on.
In case of conflicts, it's of course a little more work, but this has always
been so.
But in the bulk of cases, it's just a couple of clicks and you're done.
Michael.
_______________________________________________
fpc-devel maillist - [email protected]
https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
