One sentence from miletone e-mails caught my attention: > Commit first to the release throttle, > then "git cherry-pick" into master
I have tried searching for context. I have found this [0] wiki edit, with just > Here are a few common-sense suggestions: as an explanation. When I was working on OpenDaylight, I have encountered (around three times) a situation when this order backfires. When contributor/committer forgets to cherry-pick to master, the actual release is fixed, verified, and the associated Bug report is closed; but the next release testing shows the same Bug again. I think most OpenDaylight projects now recommend merging to master first, and only then cherry-picking to a release branch. I guess the corect order depends on which branch the committers are looking at when verifying the fix. That branch should be the last to get the cherry-pick. So what is the case for VPP committers? Should we keep the order, or switch it around? Vratko. [0] https://wiki.fd.io/index.php?title=Projects%2Fvpp%2FRelease_Plans%2FRelease_Plan_16.06&diff=1357&oldid=801 From: vpp-dev@lists.fd.io <vpp-dev@lists.fd.io> On Behalf Of Dave Wallace Sent: Friday, 2019-April-12 23:25 To: vpp-dev@lists.fd.io Subject: [vpp-dev] VPP 19.04 RC1 Milestone is COMPLETE! Folks, The VPP 19.04 RC1 Milestone is complete and stable/1904 is open for bug fixes! I have sanity tested the xenial, bionic, and centos packages that are available in packagecloud.io -- see [1] for instructions on how to install from binary packages. As is customary for all VPP stable branches, only bug fixes are allowed to be merged into stable/1904 and all bug fixes should conform to the following rules: - All bug fixes must be double-committed to the release throttle as well as to the master branch - Commit first to the release throttle, then "git cherry-pick" into master - Manual merges may be required, depending on the degree of divergence between throttle and master - All bug fixes need to have a Jira ticket - Please put Jira IDs into the commit messages. - Please use the same Jira ID for commits into the stable branch and master. Many thanks to Vanessa Valderrama, Ed Warnicke, and Ed Kern for their assistance. Next up, VPP 19.04 RC2 Milestone is next Wednesday April 17, 2019 1800 UTC. Thanks, -daw- "Your Friendly VPP 19.04 Release Manager" [1] https://wiki.fd.io/view/VPP/Installing_VPP_binaries_from_packages
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12786): https://lists.fd.io/g/vpp-dev/message/12786 Mute This Topic: https://lists.fd.io/mt/31186768/21656 Group Owner: vpp-dev+ow...@lists.fd.io Unsubscribe: https://lists.fd.io/g/vpp-dev/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
