[GitHub] [cassandra-builds] jacek-lewandowski commented on pull request #89: CASSANDRA-18399: Add a script to prepare merge commands

["jacek-lewandowski (via GitHub)" <gi...@apache.org>]

jacek-lewandowski commented on PR #89:
URL: https://github.com/apache/cassandra-builds/pull/89#issuecomment-1493765993

   My apologize for screwing things up. It was not caused by the script but by myself - I misunderstood how the CHANGES.txt should look like and I thought that the same rules apply for all the unreleased branches. I manually updated CHANGES.txt for 4.1 and for trunk, and apparently I forgot to add `--amend` when committing that to 4.1 (thus we have a duplicate merge commit 🤦🏻‍♂️). I'm really sorry for that and thank you for fixing it.
   
   The script updates CHANGES.txt in the way that for the first release branch the changes is for it adds an entry right after the version. For all other release branches, it searches for the first occurence of "Merged from x.y" where x.y is the first branch version the changes is for.
   
   Actually, that CHANGES.txt update "logic" can be extracted into a separate script so we can implement it in say Python or something more robust than Bash.
   
   Note that, the script is not aiming to change something, replace or so, just provide some aid and make merging stuff a bit easier and faster. The problems spotted here shows that it lacks some verification for git history.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


---------------------------------------------------------------------
To unsubscribe, e-mail: pr-unsubscribe@cassandra.apache.org
For additional commands, e-mail: pr-help@cassandra.apache.org