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

Merge conflict for XWiki.Admin when upgrading from default 7.1.2 to default 7.2

    XMLWordPrintable

Details

    • Bug
    • Resolution: Duplicate
    • Critical
    • None
    • 7.2
    • Extension
    • None
    • Unknown

    Description

      I've used the default jetty/hsqldb distribution and done the following:

      • unzip 7.1.2
      • unzip 7.2 and replace the data dir from the one from 7.1.2
      • start xwiki and perform the upgrade process
      • I got a merge conflict for XWiki.Admin which shouldn't happen since I didn't modify anything. See screenshots.

      Attachments

        1. conflict1.png
          252 kB
          Vincent Massol
        2. conflict2.png
          113 kB
          Vincent Massol

        Issue Links

          duplicates

          Bug - A problem which impairs or prevents the functions of the product. XE-1499 Conflict on Admin user when upgrading from 6.4.4 to 7.1.1

          • Blocker - Blocks development and/or testing work, production could not run.
          • Closed

          Activity

            People

              tmortagne Thomas Mortagne
              vmassol Vincent Massol
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: