Hi, Alain, Benoit,
If the SysML 1.1 bundles are to be removed from the Papyrus SDK to the Extras, then they should be moved in the git repository also, IMO. The plugins/ directory should contain only bundles that are packaged in the Papyrus distributions: the main SDK and the Developer Tools.
Git is, in my experience, quite good at detecting moves and handling them in merges. I was pleasantly surprised by how little trouble I had in the many rebases that I did in the first months of 2016 in my refactoring work. I think there are even options in the git diff and merge commands to “tune up” the move recognition, which adds computational complexity, but that is worth it if it reduces the occurrence of conflicts.
On 8 March, 2016 at 04:24:20, Alain Le Guennec (alain.leguennec@xxxxxxxxxxxxxxxxxxxxxxxx) wrote:
Hi Benoit,
And thanks for the answer.
One more quick question:
Will you physically move the plugins within the
repository,
or just move it to "extra" from a bundling point of
view?
(I would prefer the later if possible, to avoid some more
rebase conflicts).
Regards,
_______________________________________________
mdt-papyrus.dev mailing list
mdt-papyrus.dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/mdt-papyrus.dev
|