| [mdt-papyrus.dev] [Indigo] Merge of the branch 0.7.X in the trunk |
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 |