2 Replies Latest reply on Mar 12, 2013 6:33 AM by Lukáš Fryč

    Migrating patches from 4.3 to 5.0

    Lukáš Fryč Master

      I have did proof of concept of migrating patches from 4.3 branch to 5.0, since it appeared to be untrivial, because of:

      • merged repository subtrees
      • running dos2unix over all files
      • renamed source files

       

      At the end, I have ended up with set of scripts which can be used to migrate a patches in batches per repository:

      https://gist.github.com/lfryc/5101382

       

      Even though the procedure involves several manual interventions, it actually took me just 1,5hr to invent it

      and "fix" Core and Components 4.3 patches to apply cleanly on 5.0.

       

      The result is quite satisfying:

      https://github.com/richfaces/richfaces5/commits/applying-patches-upto-4.3.1.Final

       

      I still need to convert further commits (post 4.3.1.Final - basically fundamental test setup improvements),

       

      but I think this migration procedure is a viable solution.