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

Merge conflict hit during flavor upgrade when upgrading

    XMLWordPrintable

Details

    • Bug
    • Resolution: Fixed
    • Blocker
    • 14.4.5, 14.8, 13.10.10
    • 12.8
    • Mentions
    • None
    • Unit
    • Unknown
    • N/A
    • N/A

    Description

      Our CI is revealing a potential merge conflict when upgrading from 8.4 with the filestore.

      See https://ge.xwiki.org/scans/tests?search.relativeStartTime=P90D&search.tags=master&search.timeZoneId=Europe/Paris&tests.container=org.xwiki.test.ui.Upgrade84FileStoreTest&tests.test=upgrade#

      Screenshot

      Error Message

      Merge conflict hit during flavor upgrade

      Stacktrace

      java.lang.AssertionError: Merge conflict hit during flavor upgrade
	at org.junit.Assert.fail(Assert.java:89)
	at org.xwiki.test.ui.UpgradeTest.upgrade(UpgradeTest.java:401)
	at org.xwiki.test.ui.UpgradeTest.flavorStepKnownInvalidUpgrade(UpgradeTest.java:366)
	at org.xwiki.test.ui.UpgradeTest.flavorStep(UpgradeTest.java:328)
	at org.xwiki.test.ui.UpgradeTest.upgrade(UpgradeTest.java:216)

      Attachments

        Issue Links

          is caused by

          Bug - A problem which impairs or prevents the functions of the product. XWIKI-17723 The initialization of NotificationAdministration done by MentionEventDescriptor produces a stored event

          • Major - Major loss of function.
          • Closed

          Activity

            People

              mleduc Manuel Leduc
              mleduc Manuel Leduc
              Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: