I uploaded a build to the artemis website, just to give you an idea on what the reporting does:
https://activemq.apache.org/components/artemis/download/cherry-pick-report notice I used REST=true , as the script is currently doing it as false We should look into initially cherry-picking all bug fixes between 2.20.0 and 2.19.x? or just the critical ones? My suggestion is that we initially cherry-pick them all for the first version, and then only critical fixes as I am not looking to keep doing this branch forever. On Fri, Jan 14, 2022 at 11:30 AM Clebert Suconic <clebert.suco...@gmail.com> wrote: > > if you are interested on helping with 2.19.x, please read this: > > > > - I have added a branch 2.19.x > > Every backport from main into 2.19.x should use "git cherry-pick -x" > > > To help tracking the cherry-picks, I have created a script on main > that will generate a report of cherrypicks and commits between main > and 2.19.x > > To run it, you should have your git clone updated on main and 2.19.x... > > and run the script... > > > the following scriptlet would actually work: > > --------------- > git clone g...@github.com:apache/activemq-artemis.git > cd activemq-artemis > # needs to make sure 2.19.x is checked out for the script > git checkout 2.19.x > git checkout main > ./scripts/cherry-pick-report.sh > > --------------- > > > After you executed cherry-pick report.sh from the root folder from the > clone, you will see this: > > ============================================================================================================================== > Report generated at ./target/cherry-pick-report/cherry-pick-report.html > ============================================================================================================================== > > > > Which will have a list of commits on main since 2.19.0 and it will > show the cherry-pick points on 2.19.x (if you used cherry-pick -x, > hence why I'm asking for people to use the -x when cherry-picking it) > > > > > (this report could actually be used on ActiveMQ classic.. I think it's > quite useful on managing xrefs of cherry-picks between branches.) > > -- > Clebert Suconic -- Clebert Suconic
