On Sun, Dec 18, 2022 at 09:42:08AM +1300, Sidney Markowitz wrote: > Now that we have released 4.0.0, we can if we want create a 4.0 branch and > have trunk be for a 4.1 branch. > > Pros: If we do it now, then if something comes up that is important enough > to require a 4.0.1 patch release, we will not have commits already in svn > that are not suitable for being 4.0.1, either because they are not yet > finished, or not tested, or too extensive. We can only commit to the 4.0 > branch things that are completed and tested and deemed safe enough that 4.0 > branch will always be stable and available for a 4.0.1 release if the need > arises. Branching now means we don't have to worry that what we commit to > trunk may end up unsuitable for a future 4.0 branch. > > Cons: Until someone actually works on something that we would want in 4.1.0 > and not in a hypothetical 4.0.1, we have to consider every commit to trunk > and replicate it in the 4.0 branch. We could instead put off branching until > there is something to commit to trunk that we might not want in 4.0.1 or > that would have to be reverted as part of the process of creating a branch. > > Thoughts on this? Branch now or branch later?
This is atleast third discussion of the same? All the previous times it was concluded that branching wasn't necessary. Backporting is a pain and usually something is forgotten. It's not like we have any real developing going on, does anyone even have a guess what a new big 4.1 feature would be? For any major changes that threaten stability (like our wl/bl or meta change), a temporary branch could be used for publishing things for others to test, especially if not committed to work on it actively. Pushing normal fixes or new plugins to trunk would fine. Just please, do atleast a make test before committing. If migrating to git is "the Apache way", that would fine, we are probably holding out burying Bugzilla. But personally I lack motivation to help with anything related to that, and I'll be keeping a quieter profile anyway from now on - my goal of seeing 4.0 was reached. Cheers, Henrik
