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

Merge conflicts when upgrading XWiki from 9.11.5 to 10.5RC1 on MySQL

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Fixed
    • Affects Version/s: 10.5-rc-1
    • Fix Version/s: 9.11.7, 10.6-rc-1
    • Labels:
    • Environment:
      Windows 10 Pro 64 bit, Chrome 67, using a local instance of XWiki 10.5RC1 on MySQL 5.7
    • Difficulty:
      Unknown
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      STEPS TO REPRODUCE

      Preconditions: An instance of XWiki 9.11.5 (created with FileSystem attachment store enabled) and an instance of XWiki 10.5RC1 (to which will be migrated) are available.

      1. Go to the newer instance (e.g. 10.5RC1) 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 are encountered some merge conflicts related to the following pages: 

      Macros.TreeTranslations

      IconThemesCode.Translations

      XWiki.DocumentTreeTranslations

      XWiki.TemplateProviderTranslations

      XWiki.AdminTranslations

      SkinsCode.Translations

      XWiki.LiveTableResultsMacros

      Index.Translations

      PanelsCode.Translations

      Panels.Translations

      Main.ActivityTranslations

      XWiki.UserProfileTranslations

      XWiki.WatchListTranslations

      AnnotationCode.Translations

      FlamingoThemesCode.Translations

      Mail.Translations

      XWiki.Notifications.Code.Translations

      XWiki.UserDirectoryTranslations

      XWiki.XWikiSyntaxTranslations

      Help.Translations

      Main.SolrTranslations

      XWiki.OfficeImporterTranslations

      Invitation.Translations

      AppWithinMinutes.Translations

      CKEditor.Translations

      Dashboard.Translations (only on Main Wiki DW)

      Tour.HomepageTour.Translations

      WikiManager.CommonTranslations

      WikiManager.Translations

      Menu.MenuTranslations (only on Main Wiki DW)

       

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

        Attachments

          Issue Links

            Activity

              People

              • Assignee:
                tmortagne Thomas Mortagne
                Reporter:
                iandriuta Ilie Andriuta
              • Votes:
                0 Vote for this issue
                Watchers:
                2 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:
                  Date of First Response: