Just to add a comment on Ittay post (I’m OK with what is said): new patches should come to master first 99% of a time and then be cherry-picked if needed. It should be quite unlikely that a commit is only needed on a specific version / branch
Le 16 avr. 2020 à 17:13, Ittay Stern <[email protected]> a écrit : Added inline. (Answers are correct for VID, and should be valid for the rest of ONAP projects as well.) From: FRANEY, JOHN J <[email protected]> Sent: Thursday, April 16, 2020 5:49 PM To: Stern, Ittay <[email protected]>; [email protected] Subject: RE: onap git flow convention? Ittay, Thanks. Every project has a git flow, but not every project uses ‘git flow’, yes? I surveyed a couple aaf projects and I agree: apparently ‘git flow’ is not the git flow in use by onap. So, I’m looking for the git flow in use by onap. Thanks for letting me know that it is restricted to master and release branches. I hope to have answers to these specific questions about the ‘onap’ git flow. 1. What is the head of release branch? The last commit of current milestone? Once a release is “frozen” is will be branched out to a release branch. The release branch will get only important commits; most of times these will be cherry-picked to or from master. 1. What is onap git flow to accept feature contributions during RCx code freeze? Feature will wait. If release branch was branched already, it can go to master, waiting for next release. 1. What is the head of master? The next intended release commits? yes 2. Where would hot fix commits go? The release branch, right? Both master and release branches. John From: STERN, ITTAY <[email protected]<mailto:[email protected]>> Sent: Thursday, April 16, 2020 10:13 AM To: [email protected]<mailto:[email protected]>; FRANEY, JOHN J <[email protected]<mailto:[email protected]>> Subject: RE: onap git flow convention? Got-flow is not common in ONAP. I can tell it in high assurance, as Gerrit does not allow practical feature-branching. There are only master and release branches. From: [email protected]<mailto:[email protected]> <[email protected]<mailto:[email protected]>> On Behalf Of FRANEY, JOHN J Sent: Thursday, April 16, 2020 4:53 PM To: [email protected]<mailto:[email protected]> Subject: [onap-discuss] onap git flow convention? ***Security Advisory: This Message Originated Outside of AT&T *** Reference http://cso.att.com/EmailSecurity/IDSP.html for more information. Hi, Is there convention in onap development for a git flow? I’m unable to find a wiki doc describing a common onap git flow. If there is not a convention, what works? When I say ‘git flow’, I mean something like this: https://nvie.com/posts/a-successful-git-branching-model/<https://urldefense.proofpoint.com/v2/url?u=https-3A__nvie.com_posts_a-2Dsuccessful-2Dgit-2Dbranching-2Dmodel_&d=DwQFAg&c=LFYZ-o9_HUMeMTSQicvjIg&r=NJAEHfQoLAqU6Mfo-WCvDEGsbs3O9RNyC3XFKZ7W_Pw&m=7EzCs3cDbePKmGB0H0Yu2AANghjhNEwlbHw1sTjkvWc&s=mkvbpdgdUZawZJV6aMOaSp7ZPh4JpjSP_9NGZ2fpKcM&e=> Thanks, John _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you. -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#20704): https://lists.onap.org/g/onap-discuss/message/20704 Mute This Topic: https://lists.onap.org/mt/73054581/21656 Group Owner: [email protected] Unsubscribe: https://lists.onap.org/g/onap-discuss/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
