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

Merge conflicts on NotificationsDisplayerUIX when upgrading XWiki from 9.11.4 to 10.4 on MySQL

    XMLWordPrintable

Details

    • Bug
    • Resolution: Cannot Reproduce
    • Major
    • None
    • 10.4
    • Notifications
    • Windows 10 Pro 64 bit, Chrome 66, using a local instance of XWiki 10.4
    • Unknown
    • N/A
    • N/A

    Description

      STEPS TO REPRODUCE

      Preconditions: An instance of XWiki 9.11.4 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 displayed a merge conflict related to the page XWiki.Notifications.Code.NotificationsDisplayerUIX (screenshot attached).

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

      Attachments

        1. 9114_to_104_conflict_1.jpg
          303 kB
          Ilie Andriuta
        2. 9114_to_104_conflict_2.jpg
          337 kB
          Ilie Andriuta

        Activity

          People

            surli Simon Urli
            iandriuta Ilie Andriuta
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: