There is no reason nowadays not to bump the code subversion immediatelly upon code change - as opposed to put code into the /* Versioning code until next subversion bump goes here. */ blocks.
Will reduce extra work and conflicts on release (branching) (Bcon3/Bcon5).
High Priority reports number is still very high (45+), with many of them being more than 1-2 months old.
Agreed about this, but what about removing these sections then? They’ve always been one of the more confusing parts of the versioning code for new developers anyway.
Thomas will come up with a PR for this, so we can leave specifics for then. Personally I think having a comment block there that explains how to proceed is nice. At least during a transition period.
I haven’t given much thoughts to what we keep from the existing code vs what should stay. So I may have misrepresented the upcoming solution while writing the notes.
I’m probably missing something, so this might be more a question than a comment.
But I’ve always used the /* Versioning code until next subversion bump goes here. */ section as a temporary place to put versioning code in a PR while it is being reviewed. Then once approved I do the version bump, move that version code out into its own section, update the PR, and then merge.
If not doing it this way then the PR contains the current blender version so won’t it then conflict all the time while awaiting approval?
You can still do that for PRs before final commit, even though the block is gone in main. The reason behind the change is, that a proper version bump is always done on code submission now, rather than putting it into the temporary block and keep it there for weeks.