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

Merge conflicts when upgrading XWiki from 8.4.6 to 10.4 on MySQL

    XMLWordPrintable

Details

    • Bug
    • Resolution: Duplicate
    • Major
    • None
    • 10.4
    • None
    • Windows 10 Pro 64 bit, Chrome 66, using a local instance of XWiki 10.4
    • Unknown

    Description

      STEPS TO REPRODUCE

      Preconditions: An instance of XWiki 8.4.6 and an instance of XWiki 10.4 (to which will be migrated) are available.

      1. Go to the newer instance (e.g. 10.4) and copy/cut the
        [...]webapps\xwiki

        folder and replace it (first delete the old one) in the same location on the older version

      1. Start the instance and follow the Distribution Wizard through the upgrade process

      EXPECTED RESULTS

      The upgrade process is completed successfully without errors.

      ACTUAL RESULTS

      On Step 2 - Flavor is encountered a merge conflict related to the page Tour.HomepageTour.Translations (screenshot attached).

      The issue was reproduced only on MySQL (5.7) DB.

      Attachments

        Issue Links

          Activity

            People

              tmortagne Thomas Mortagne
              iandriuta Ilie Andriuta
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: