Details
-
Bug
-
Resolution: Fixed
-
Major
-
10.5-rc-1
-
Windows 10 Pro 64 bit, Chrome 67, using a local instance of XWiki 10.5RC1 on MySQL 5.7
-
Unknown
-
N/A
-
N/A
-
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.
- 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
- 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
- is duplicated by
-
XWIKI-15372 Merge conflicts when upgrading XWiki from 8.4.6 to 10.5RC1 on MySQL
- Closed