neos / neos-development-collection

The unified repository containing the Neos core packages, used for Neos development.
https://www.neos.io/
GNU General Public License v3.0
260 stars 218 forks source link

TASK: Remove obsolete OUTDATED_CONFLICT state leftovers #5143

Open mhsdesign opened 2 weeks ago

mhsdesign commented 2 weeks ago

Resolves: #5101

Upgrade instructions

Review instructions

MUST BE CAREFULLY REVIEWED... please dont trust my proposal :D

with https://github.com/neos/neos-development-collection/pull/4965 we never create rebase was failed events anymore and the logic to query OUTDATED_CONFLICT workspaces was removed. To have a consistent and understandable codebase without dead artefacts i removed the OUTDATED_CONFLICT flag and for the legacy event (in case of a replay) OUTDATED will be written to the database as otherwise the workspace will probably disappear and not be to recover

Checklist

pKallert commented 5 days ago

Since we remove the OUTDATED_CONFLICT, perhaps the test scenario text here should be adjusted? https://github.com/neos/neos-development-collection/blob/10e3259a02da4bc7b91d615d79de7fa9f11e9263/Neos.ContentRepository.BehavioralTests/Tests/Behavior/Features/W6-WorkspaceRebasing/03-RebasingWithConflictingChanges.feature#L49