On Wed, Jan 5, 2022 at 10:38 PM Mick Semb Wever <m...@apache.org> wrote:
> +(?) Is the devil we know >> > > + Bi-directional relationship between patches showing which branches it > was applied to (and how). From the original commit or any of the merge > commits I can see which branches, and where the original commit, was > applied. (See the mongo example from Henrik, how do I see which other > branches the trunk commit was committed to? do i have to start text > searching the git history or going through the ticket system :-( > Just to answer the question, I'm obviously not that impacted by how Cassandra commits happen myself... Maybe a thing I wouldn't copy from MongoDB is that their commit messages are often one liners and yes you need to look up the jira ticket to read what the commit does. A feature of this approach is that the jira ticket can be edited later. But personally I always hated that the commit itself didn't contain a description. Other than that, yes I would grep or otherwise search for the ticket id or githash, which must be included in the cherry picked commit. It never occurred to me someone wouldn't like this. Note that the stable branches eventually only get a handful of patches per month, so even just reading the git log gives a nice overview. If anything the "merge branch X into Y" always confuse me as I have no idea what that does. As for verifying that each branch was patched, if you adhere to committing first to trunk, then in descending order to each stable branch, you can just check the oldest branch to verify the chain. Not everyone followed this style, but I would always append the cherry pick message, so that the last commit (to the oldest stable branch) would contain the chain of githashes all the way to trunk. henrik -- Henrik Ingo +358 40 569 7354 <358405697354> [image: Visit us online.] <https://www.datastax.com/> [image: Visit us on Twitter.] <https://twitter.com/DataStaxEng> [image: Visit us on YouTube.] <https://urldefense.proofpoint.com/v2/url?u=https-3A__www.youtube.com_channel_UCqA6zOSMpQ55vvguq4Y0jAg&d=DwMFaQ&c=adz96Xi0w1RHqtPMowiL2g&r=IFj3MdIKYLLXIUhYdUGB0cTzTlxyCb7_VUmICBaYilU&m=bmIfaie9O3fWJAu6lESvWj3HajV4VFwgwgVuKmxKZmE&s=16sY48_kvIb7sRQORknZrr3V8iLTfemFKbMVNZhdwgw&e=> [image: Visit my LinkedIn profile.] <https://www.linkedin.com/in/heingo/>
