Hi, +1
I agree with Ashok and this will be a best approach. A single squash merge from 1.1-rel into master will be the best. It will save lot of merges and ease in proper testing. Regards Habib From: ASHOKBABU CHANNA [mailto:[email protected]] Sent: 27 April 2016 10:23 To: Uze Choi; RANDEEP SINGH; Markus Jung; Habib Virji; Kim Jungho; Madan Kanth Lanka Cc: Jee Hyeok Kim; iotivity-dev at lists.iotivity.org Subject: Re: RE: RE: Verify 1.1-rel patches went to master Hi, How about merging the release branch back to master after each release? It is possible that manual verification might cause errors. and this merge will allow us to track features removed in git history for each release. We can run BAT and SQ verification once it is merged. Regards, Ashok ------- Original Message ------- Sender : Uze Choi<uzchoi at samsung.com> S6/Principal Engineer/IoT Lab./Samsung Electronics Date : Apr 27, 2016 10:29 (GMT+05:30) Title : RE: RE: Verify 1.1-rel patches went to master I think this is totally Up to project situation whether By cherrypicking individual patch or By single merged one, by original individual author or single maintainer. BR, Uze Choi From: RANDEEP SINGH [mailto:[email protected]] Sent: Wednesday, April 27, 2016 1:53 PM To: Uze Choi; Markus Jung; Habib Virji; Kim Jungho; Madan Kanth Lanka Cc: ASHOKBABU CHANNA; Jee Hyeok Kim Subject: Re: RE: Verify 1.1-rel patches went to master Hi All, As 1.1 branch and master branch are quite diverged from each other and all modules have dependency on other modules. my suggestion is we should work on one change set and every module owner should submit their patches to that change set,then after doing testing of final change. We can merge that patch to master. Please share your opinion on this. We have created a patch to merge all the 1.1 code to master for security(https://gerrit.iotivity.org/gerrit/#/c/7889/) but we have to update some code of other modules to build the code. Thanks, Randeep ------- Original Message ------- Sender : Uze Choi<uzchoi at samsung.com> S6/Principal Engineer/IoT Lab./Samsung Electronics Date : Apr 25, 2016 12:25 (GMT+05:30) Title : RE: Verify 1.1-rel patches went to master Hi Each maintainer, Could you make sure all patches from Rel1.1 are merged back to master branch? Discovery&Connectivity Resource Layer: Habib Discovery&Connectivity CA Layer: Ashok. Primitive Service (Done) Security : Randeep Cloud : JK Please share the status and plan to secure the master branch code fidelity. BR, Uze Choi From: ???(Uze Choi) [mailto:[email protected]] Sent: Wednesday, April 20, 2016 9:35 AM To: 'markus.jung at samsung.com'; 'habib.virji at samsung.com'; 'RANDEEP SINGH'; 'Kim Jungho'; 'lanka.madan at samsung.com' Cc: ASHOKBABU CHANNA (ashok.channa at samsung.com); ??? (jihyeok13.kim at samsung.com) Subject: RE: Verify 1.1-rel patches went to master + Ashok(D&C), JK(Cloud) Patches for Primitive Service are merged back to master. BR, Uze Choi From: Markus Jung [mailto:[email protected]] Sent: Wednesday, April 20, 2016 3:57 AM To: Uze Choi; habib.virji at samsung.com; RANDEEP SINGH; Kim Jungho; lanka.madan at samsung.com Subject: Verify 1.1-rel patches went to master Hello IoTivity maintainers, thanks for your great work for the 1.1 release! Could you please verify that the patches you merged on 1.1-rel also made it to the master branch. Thank you, Best Regards Markus ---------------------------------------------------------------------------- ------ Sr. Technical Manager, Software Architect. SRI-B, IoT Division/ IoTivity, Samsung Electronics Co., Ltd. +91-9880709710 ---------------------------------------------------------------------------- ------ -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20160427/aa694d59/attachment.html> -------------- next part -------------- A non-text attachment was scrubbed... Name: image001.gif Type: image/gif Size: 13168 bytes Desc: not available URL: <http://lists.iotivity.org/pipermail/iotivity-dev/attachments/20160427/aa694d59/attachment.gif>
