Uploaded image for project: '{RETIRED} XWiki Enterprise'
  1. {RETIRED} XWiki Enterprise
  2. XE-1350

There are lots of conflicts when upgrading from 4.1.4 to 5.2.2 using distribution wizard

    XMLWordPrintable

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Major
    • Resolution: Invalid
    • Affects Version/s: 5.2.2
    • Fix Version/s: None
    • Component/s: Packaging
    • Labels:
      None
    • Documentation:
      N/A
    • Documentation in Release Notes:
      N/A
    • Similar issues:

      Description

      This issue is the same as XE-1347. I migrated the Main Wiki from 4.1.4 to 5.2.2 and always got 18 merge conflicts: one for Main.WebHome and the others for the WorkspaceManager space. Also the pages conflicting only have a "Current" and "New" comparison option. You don't have "Previous" in any of the drop-downs except for Main.WebHome. I've added screenshots for each conflict.

        Attachments

        1. Main.WebHome.png
          46 kB
          Manuel Smeria
        2. WorkspaceManager.BrowseWorkspacesLiveTableResults.png
          64 kB
          Manuel Smeria
        3. WorkspaceManager.BrowseWorkspacesLiveTableResultsMacros.png
          222 kB
          Manuel Smeria
        4. WorkspaceManager.CreateNewWorkspace.png
          1.29 MB
          Manuel Smeria
        5. WorkspaceManager.DeleteWorkspaceCode.png
          124 kB
          Manuel Smeria
        6. WorkspaceManager.Install.png
          1.07 MB
          Manuel Smeria
        7. WorkspaceManager.IsWikiOrDatabaseOrWorkspaceAvailableService.png
          19 kB
          Manuel Smeria
        8. WorkspaceManager.JoinWorkspaceCode.png
          554 kB
          Manuel Smeria
        9. WorkspaceManager.LeaveWorkspaceCode.png
          168 kB
          Manuel Smeria
        10. WorkspaceManager.Style.png
          57 kB
          Manuel Smeria
        11. WorkspaceManager.Translations.png
          651 kB
          Manuel Smeria
        12. WorkspaceManager.UpdateWorkspaceCode.png
          88 kB
          Manuel Smeria
        13. WorkspaceManager.UserWorkspaceSheet.png
          195 kB
          Manuel Smeria
        14. WorkspaceManager.WebHome.png
          59 kB
          Manuel Smeria
        15. WorkspaceManager.WorkspaceActivityServiceCode.png
          71 kB
          Manuel Smeria
        16. WorkspaceManager.WorkspaceClass.png
          18 kB
          Manuel Smeria
        17. WorkspaceManager.Workspaces.png
          111 kB
          Manuel Smeria
        18. WorkspaceManager.WorkspacesSuggestLuceneService.png
          38 kB
          Manuel Smeria

          Issue Links

            Activity

              People

              Assignee:
              tmortagne Thomas Mortagne
              Reporter:
              msmeria Manuel Smeria
              Votes:
              0 Vote for this issue
              Watchers:
              3 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved:
                Date of First Response: