| Re: [mdt-papyrus.dev] [Indigo] Merge of the branch 0.7.X in thetrunk |
|
Hi all, Thanks to Remi to send this reminder. I DO SUPPORT THIS PROCESS AND HOPE EVERYONE WILL RESPECT IT! Thanks to you, Cheers… Sébastien. De : mdt-papyrus.dev-bounces@xxxxxxxxxxx [mailto:mdt-papyrus.dev-bounces@xxxxxxxxxxx] De la part de SCHNEKENBURGER Remi 211865 Hi all, I would like to remember you these recent instructions. It is very important to realize the merge of the branch 0.7.X modifications into the trunk systematically, in order to avoid inconsistency between the branch and the trunk. Bug fixed in the branch should not be present anymore into the head. Doing this systematically when you commit a bug fix on the branch would also avoid other developers to do the job for you. Due to new APIs in the Indigo release, due to EMF Facet for example), it can be very tough for a person who was not in charge of the commit to identify how to merge the branch and the trunk. Moreover, I do not have much time to do such a job: it is very easy to do it on minor modifications, rather than a large set of commits, when I do not know myself what is the real content of the commit. Regards, Rémi De : mdt-papyrus.dev-bounces@xxxxxxxxxxx [mailto:mdt-papyrus.dev-bounces@xxxxxxxxxxx] De la part de SCHNEKENBURGER Remi 211865 Hi all, I made recently a merge of the branch 0.7.X in the trunk, in order to prepare the first release of Papyrus Indigo version. As some commits were duplicated from branch to head, there were some conflicts I tried to resolve. Moreover the merge of the gmfgen plugins can be very hard to do. For plugin developers, please check : - That your gmfgen files are still valid in the trunk and that your gmfgen files are still able to generate code. You should also modify your gmfgen in order to produce plugins with correct version number, i.e. 0.8.0.qualifier. I did update all version number of plugins, fragment and features, I did not update gmfgen files. - That all the commits you push in the branch are merged in the trunk. I found some interesting resources on the web about this procedure, for example http://svnbook.red-bean.com/en/1.0/ch04s04.html Regards, Rémi ----------------------- Remi Schnekenburger +33 (0)1 69 08 48 48 - remi.schnekenburger@xxxxxx CEA LIST, Laboratoire d’Ingénierie dirigée par les modèles pour les Systèmes Embarqués (LISE), Point Courrier 94, Gif-sur-Yvette, F-91191 France |