Skip to content

[FEATURE] Introduce Sudo-Mode Events #5893

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

Merged
merged 4 commits into from
Jul 23, 2025
Merged

[FEATURE] Introduce Sudo-Mode Events #5893

merged 4 commits into from
Jul 23, 2025

Conversation

linawolf
Copy link
Member

Resolves: TYPO3-Documentation/Changelog-To-Doc#1257
Releases: main, 13.4, 12.4

linawolf added 2 commits July 19, 2025 11:07
Releases: main, 13.4, 12.4
Releases: main, 13.4, 12.4
@linawolf linawolf added backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13 labels Jul 19, 2025
@ohader
Copy link
Contributor

ohader commented Jul 21, 2025

Looks good in general.

linawolf and others added 2 commits July 23, 2025 08:47
* Move development information a subpage
* Address Administrators and how to call commands

References: #5896
Releases: main, 13.4, 12.4
Copy link
Contributor

@sarahmccarthy123 sarahmccarthy123 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 :-)

@linawolf linawolf merged commit 6a1a2d3 into main Jul 23, 2025
10 checks passed
@linawolf linawolf deleted the feature/sudo branch July 23, 2025 13:17
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 2ab10cd8d... [FEATURE] Introduce Sudo-Mode Events
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
CONFLICT (modify/delete): Documentation/ApiOverview/Authentication/BackendUsers/Index.rst deleted in HEAD and modified in 2ab10cd8d ([FEATURE] Introduce Sudo-Mode Events).  Version 2ab10cd8d ([FEATURE] Introduce Sudo-Mode Events) of Documentation/ApiOverview/Authentication/BackendUsers/Index.rst left in tree.
Auto-merging Documentation/CodeSnippets/Config/Api/Events/EventsBackend.php
CONFLICT (content): Merge conflict in Documentation/CodeSnippets/Config/Api/Events/EventsBackend.php

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-12.4 12.4
# Navigate to the new working tree
cd .worktrees/backport-12.4
# Create a new branch
git switch --create backport-5893-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 2ab10cd8ddde34c0ab0dae990438038a0edd874e,6df2db7803ad0adf732b2486c0a9ada924d41188,938857a93b43b60e8eafa46bc6905980090b0edd,fc4f504afcdd9b4fe13d366018e80bdd20c055a6
# Push it to GitHub
git push --set-upstream origin backport-5893-to-12.4
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-12.4

Then, create a pull request where the base branch is 12.4 and the compare/head branch is backport-5893-to-12.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport failed backport 12.4 Backport to TYPO3v12 backport 13.4 Backport to TYPO3v13
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE] Introduce Sudo-Mode Events
3 participants