(Maybe we can also change the base branch of any existing pull request to that Jena4 branch, so even in the future after we merge Jena5 into main, those PR's could be left reviewed for Jena4 if needed?)
On Thu, 12 Oct 2023 at 11:40, Bruno Kinoshita <brunodepau...@gmail.com> wrote: > Hi Andy, > > Maybe we should use rebase and merge" for PRs from now on? >> > > I try to use rebase and merge as it works best for me to keep the git > commit tree in order, so I'm +1 for that. > > I'd like to bring the PR in as a branch and setup Jenkins to produce >> snapshot artifacts. >> >> The branch might still liable to force pushes to keep the history >> comprehensible, such as rebasing it to main, and finally when switching >> to this branch to be main if we use rebase and merge. >> > > Given that I believe most of the Jena development should now be focused on > Jena5, wouldn't it make more sense to create a Jena4 branch, merge Jena5 > branch into main, and backport bug fixes to the Jena4 branch as needed? > > I think we might even be able to cut releases from that branch. > > That way, I think we could say that the official version under development > is Jena5, and Jena4 is now in hotfix maintenance, until Jena5 is released > (plus whatever time we need/can to support it in the future). > > Cheers > > Bruno > > > > On Thu, 12 Oct 2023 at 11:05, Andy Seaborne <a...@apache.org> wrote: > >> >> On 06/10/2023 11:47, Andy Seaborne wrote: >> > There's a large PR for a new branch "jena5" >> > >> > https://github.com/apache/jena/pull/2029 >> > >> > of what I've managed to do so far. >> > >> > It's not finished. >> > >> > Andy >> >> I'd like to bring the PR in as a branch and setup Jenkins to produce >> snapshot artifacts. >> >> The branch might still liable to force pushes to keep the history >> comprehensible, such as rebasing it to main, and finally when switching >> to this branch to be main if we use rebase and merge. >> >> I think having a baseline for people to look at and maybe even try out, >> is better than waiting until the very last minute to become Jena5. >> >> Maybe we should use rebase and merge" for PRs from now on? >> >> Andy >> >
