Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TASK: Add force strategy to the rebase workspace command #4939

Merged
merged 2 commits into from
Mar 15, 2024

Conversation

mficzel
Copy link
Member

@mficzel mficzel commented Mar 13, 2024

This change allows to specify the error handling strategy for the rebaseWorkspace command and introduces a force option there. If no strategy is specified the fail strategy is uses which is the same behavior as before.

Based on this the workspace:rebase command is extended with a new --force option that allows to rebase even workspaces in state OUTDATED_CONFLICT by ignoring all conflicting events and preserving the rest.

Partially solves: #4866 (cli part)

In addition the number of logged informations when a rebase failed is reduced to a sane size that does not grow exponentially. Resolves: #4545

Upgrade instructions

Review instructions

I suggest to add a workspace:duplicate command in a separate pr that can be run before workspace:rebase --force to keep the changes for later reference.

Checklist

  • Code follows the PSR-2 coding style
  • Tests have been created, run and adjusted as needed
  • The PR is created against the lowest maintained branch
  • Reviewer - PR Title is brief but complete and starts with FEATURE|TASK|BUGFIX
  • Reviewer - The first section explains the change briefly for change-logs
  • Reviewer - Breaking Changes are marked with !!! and have upgrade-instructions

@mficzel mficzel force-pushed the task/forceRebase branch 3 times, most recently from 00ade59 to 11b4caf Compare March 13, 2024 14:48
@mficzel mficzel marked this pull request as ready for review March 13, 2024 17:06
@mficzel mficzel changed the title TASK: Add force strategy to the rebase workspace command TASK: Add force strategy to the rebase workspace command Mar 13, 2024
@mficzel mficzel force-pushed the task/forceRebase branch 2 times, most recently from 39ba30d to 3994b37 Compare March 14, 2024 18:13
@mficzel mficzel requested a review from nezaniel March 14, 2024 18:15
In addition the number of logged informations when a rebase failed is reduced to a sane size that does not grow exponentially.

Resolves: neos#4545
Copy link
Member

@nezaniel nezaniel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, nice

@ahaeslich ahaeslich merged commit fc71823 into neos:9.0 Mar 15, 2024
10 checks passed
@mhsdesign
Copy link
Member

workspace:duplicate yeah or rather a workspace:reset backup-ws workspace-to-copy

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

TASK: Reduce stored payload data for WorkspaceRebaseFailed in database
4 participants