Hi Christian,
On 12/12/19 4:35 PM, Christian Daudt via TSC wrote:
On a separate topic, I'm looking through the TF-A recent merges, and it seems that code makes it in 'master' without being merged through gerrit (e.g. I can only find a merge into 'integration' in gerrit for the lastest commit in 'master': https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/commit/?id=ebff1... https://review.trustedfirmware.org/q/I46b21573ed25a0ff222eac340e1e1fb93b0407...). Did I miss it or is the flow different than submitting to master in gerrit for inclusion into TF-A?
That's right. In TF-A, once a patch has been reviewed, 1. We first merge it into the integration branch through Gerrit. 2. Then the integration branch goes through some more automated testing overnight. 3. If no major problems are raised, we catch up the master branch with the integration branch. Right now, we do that manually from command line, i.e. not through Gerrit.
This process is described here: https://trustedfirmware-a.readthedocs.io/en/latest/process/contributing.html...
I hope that helps.
Regards, Sandrine IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.