This issue has been created
There are 10 updates.
 
 
XWiki Platform / cid:jira-generated-image-avatar-eb558a64-f08c-4d31-8a7c-a652ade33f7d XWIKI-23441 Closed

Merge fallback of xobjects is badly handled
 
View issue   ยท   Add comment
 

Issue created

 
cid:jira-generated-image-avatar-e8d967f2-bd75-4263-8dd6-0e8f12fddf5d Simon Urli created this issue on 06/Aug/25 17:30
 
Summary: Merge fallback of xobjects is badly handled
Issue Type: cid:jira-generated-image-avatar-eb558a64-f08c-4d31-8a7c-a652ade33f7d Bug
Affects Versions: 16.10.10
Assignee: Unassigned
Components: Storage - Merge
Created: 06/Aug/25 17:30
Priority: cid:jira-generated-image-static-major-7183e56d-e4c9-402a-a73a-4475a4d15b29 Major
Reporter: Simon Urli
Description:

When the next version is chosen for merging an xobject that has been deleted in current version, the merge result should contain a conflict and the new xobject. Right now the merge result doesn't contain any object and no conflict is recorded.
See CRAPP-395 for a real life usecase.
 
 

10 updates

 
cid:jira-generated-image-avatar-e8d967f2-bd75-4263-8dd6-0e8f12fddf5d Changes by Simon Urli on 06/Aug/25 17:31
 
Fix Version: 17.7.0-rc-1
Fix Version: 16.10.11
Fix Version: 17.4.4
Fix Version: 17.6.1
Documentation in Release Notes: N/A
Documentation: N/A
Assignee: Simon Urli
Resolution: Fixed
Tests: Unit
Status: Open Closed
 
 
This message was sent by Atlassian Jira (v9.3.0#930000-sha1:287aeb6) Atlassian logo
If image attachments aren't displayed, see this article.