Uploaded image for project: 'XWiki Platform'
  1. XWiki Platform
  2. XWIKI-19443

Merge conflict during migration from 9.10.1 to 13.10.2

    XMLWordPrintable

    Details

    • Type: Improvement
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: 13.10.2
    • Fix Version/s: None
    • Component/s: Extension
    • Labels:
      None
    • Environment:
      Docker 17.05.0-ce
      PostgreSQL
      xwiki:13.10.2-postgres-tomcat
    • Difficulty:
      Unknown
    • Similar issues:

      Description

      During migration process from XWiki 9.10.1 to 13.10.2 we've got merge conflict despite we've selected to choose the file version of the new flavor.
      When the XAR are not modified the migration process should not loose time with merging process and only replace old version by new version.
      If the old XAR of the old version was tuned then the migration process should warm it.

      Regards.
      Camille Desmots

       

        Attachments

        1. 3r9qDi.png
          3r9qDi.png
          184 kB
        2. Extract of log with merge conflict.log
          189 kB
        3. KHMjzy.png
          KHMjzy.png
          121 kB
        4. LTrBly.png
          LTrBly.png
          539 kB
        5. ndfgdfgzIyWU.png
          ndfgdfgzIyWU.png
          116 kB

          Activity

            People

            Assignee:
            Unassigned Unassigned
            Reporter:
            Camille_D Camille Desmots
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Dates

              Created:
              Updated:
              Date of First Response: