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] Move menus properties into dataprocessor #1484

Merged
merged 1 commit into from
Dec 22, 2024
Merged

Conversation

linawolf
Copy link
Member

Keep HMENU / TMENU for backward compability
reasons but remove outdated examples.

Some special menu types still rely on HMENU,
I will work on them in follow-ups.

Releases: main, 13.4

Keep HMENU / TMENU for backward compability
reasons but remove outdated examples.

Some special menu types still rely on HMENU,
I will work on them in follow-ups.

Releases: main, 13.4
@linawolf linawolf self-assigned this Dec 22, 2024
@linawolf linawolf merged commit c18dff7 into main Dec 22, 2024
9 checks passed
@linawolf linawolf deleted the task/menu branch December 22, 2024 09:09
Copy link
Contributor

The backport to 12.4 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c6952702... [!!!][TASK] Move menus properties into dataprocessor
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 advice.mergeConflict false"

stdout
Auto-merging Documentation/ContentObjects/Hmenu/Tmenu/Index.rst
Auto-merging Documentation/ContentObjects/Hmenu/Tmenu/Tmenuitem.rst
Auto-merging Documentation/DataProcessing/Index.rst
CONFLICT (content): Merge conflict in Documentation/DataProcessing/Index.rst
CONFLICT (modify/delete): Documentation/DataProcessing/MenuProcessor.rst deleted in c6952702 ([!!!][TASK] Move menus properties into dataprocessor) and modified in HEAD.  Version HEAD of Documentation/DataProcessing/MenuProcessor.rst left in tree.
Auto-merging Documentation/DataProcessing/MenuProcessor/Browse.rst
Auto-merging Documentation/DataProcessing/MenuProcessor/Language.rst
Auto-merging Documentation/DataProcessing/MenuProcessor/Rootline.rst
CONFLICT (rename/delete): Documentation/ContentObjects/Hmenu/_code-snippets/_BreadcrumbDataProcessor.typoscript renamed to Documentation/DataProcessing/MenuProcessor/_code-snippets/_BreadcrumbDataProcessor.typoscript in c6952702 ([!!!][TASK] Move menus properties into dataprocessor), but deleted in HEAD.
CONFLICT (rename/delete): Documentation/ContentObjects/Hmenu/_code-snippets/_BreadcrumbLib.typoscript renamed to Documentation/DataProcessing/MenuProcessor/_code-snippets/_BreadcrumbLib.typoscript in c6952702 ([!!!][TASK] Move menus properties into dataprocessor), but deleted in HEAD.
CONFLICT (rename/delete): Documentation/ContentObjects/Hmenu/_code-snippets/_LanguageMenuLib.typoscript renamed to Documentation/DataProcessing/MenuProcessor/_code-snippets/_LanguageMenuLib.typoscript in c6952702 ([!!!][TASK] Move menus properties into dataprocessor), but deleted in HEAD.
CONFLICT (rename/delete): Documentation/ContentObjects/Hmenu/_code-snippets/_RelPrevNextMenu.typoscript renamed to Documentation/DataProcessing/MenuProcessor/_code-snippets/_RelPrevNextMenu.typoscript in c6952702 ([!!!][TASK] Move menus properties into dataprocessor), but deleted in HEAD.

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-1484-to-12.4
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick c6952702e634a82b29d5af87f3270f489ddaabf9
# Push it to GitHub
git push --set-upstream origin backport-1484-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-1484-to-12.4.

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.

1 participant