Merging and migrating across MPS versions

Hi Community,

What are people's recommendations/experiences around migrating your codebase to a newer version of MPS and merging branches? Let me make it more concrete with an example:

Let's say I have two branches master and B. Both branches are using version X of MPS. Now let's say I do a migration of the codebase in B to MPS a newer version of MPS (say Y).

My own careful way of handling this would be: first merge all the branches into master, make all people commit all their changes, then migrate up to MPS version Y and then release it again for development. This requires pausing all development for the period of the migration.

Another way to approach this, would be to, e.g. just upgrade branch B to the new MPS version Y and keep developing there. Then, at some point, when master also migrates to version Y, I may be able to just merge (although I am not sure what happens with UUIDs and such). Then, all the branches that are not there yet, can at their leisure go to a new version of MPS when they are ready to.

Is this second way of handling a migration possible at all? If yes, what are caveats/tips/tricks?

Thanks a lot in advance for any hints!

Best regards,

Eugen

2 comments
Comment actions Permalink

Both ways are possible, although the second one gives you more freedom in when you migrate what branch. https://confluence.jetbrains.com/display/MPSD20172/Using+Migrations+with+branching covers the subject, although you will not find tips-n-tricks there yet.

Vaclav

 

0
Comment actions Permalink

Thanks a lot for your answer, Václav! 

I'll have a look at the contents. The above link was not working, however. Here is one that works for me: https://confluence.jetbrains.com/display/MPSD20172/Using+Migrations+with+branching

Best regards,

Eugen

0

Please sign in to leave a comment.