Details
-
Bug
-
Resolution: Duplicate
-
Major
-
None
-
5.0-rc-1
-
Unknown
-
Description
I created a workspace with XWiki Manager 4.5 and then upgraded to 5.0RC1. I didn't modify any of the workspace pages. During the upgrade I got a merge conflict on the workspace home page title, Main.WebHome:
// Previous version, coming from XWiki Enterprise UI 4.5
$msg.get("xe.home.title")
// Current version, coming from Workspace Template 4.5
#set($wikiDescriptor = $services.wikimanager.getWikiDocument($xcontext.database))#{if}("$!wikiDescriptor.getValue('wikiprettyname')" != '')$wikiDescriptor.getValue('wikiprettyname')#{else}$wikiDescriptor.wikiName#{end}
// Next version, coming from XWiki Enterprise UI 5.0RC1
$services.localization.render('xe.home.title')
The issue is that the Workspace Template is overwriting the home page, changing the title. The Extension Manager sees this as a change made by the user and so it tries to do an automatic 3-way merge, which fails with a conflict.
Attachments
Issue Links
- duplicates
-
-
- Closed
-
- is related to
-
-
- Closed
-