Inbetween "we never use branches" and "infinite branches bad" is every sane git workflow.
Git flow, or something. stable, trunk, at least. On Wed, Apr 22, 2026 at 11:29 AM Florian Klämpfl via fpc-pascal < [email protected]> wrote: > > > Am 22.04.2026 um 20:01 schrieb Warren Postma via fpc-pascal < > [email protected]>: > > >As they should. It's then up to the FPC team to backport (cherry-pick) > them to a fixes branch. > > This feels weird to me for some reason, maybe that's normal in this > project, but it seems more Git-normal to not commit bugfixes straight to > trunk. Is this a holdover from the svn days when that's the only workflow > you had because svn branching was... broken? > > > No. But managing a branch for every change would basically mean thousands > of branches. This is possible for projects like linux or whatever when > there are people doing nothing else than managing branches. FPC does not > have such resources. Despite this, I think also LLVM despite having huge > support uses a cherry pick based approach to port fixes to stable branches. > > > > W > > On Tue, Apr 21, 2026 at 11:04 PM Graeme Geldenhuys via fpc-pascal < > [email protected]> wrote: > >> On Tuesday, 21 April 2026 00:16:46 BST Warren Postma via fpc-pascal wrote: >> > The currently open PRs seem to 100% target main, not 3_2_4 and >> >> As they should. It's then up to the FPC team to backport (cherry-pick) >> them to >> a fixes branch. >> >> > few seem to be cleanly even able to land on main anymore after the many >> > months of them sitting open, that's the trick, I think. >> >> Correct. I'll be starting this week, going through all the open MRs and >> triage/label them for the authors to action, so we can get them back up >> to >> date (or closed). >> >> Regards, >> Graeme >> >> >> >> >> >> _______________________________________________ >> fpc-pascal maillist - [email protected] >> https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-pascal >> > _______________________________________________ > fpc-pascal maillist - [email protected] > https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-pascal > > > _______________________________________________ > fpc-pascal maillist - [email protected] > https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-pascal >
_______________________________________________ fpc-pascal maillist - [email protected] https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-pascal
