thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-10 01:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Follow up recommendations from #57167

Browse Source
This commit is contained in:
Mikhail f. Shiryaev 2023-11-28 11:51:06 +01:00
parent ae09d04578
commit 8c4592f5c2
No known key found for this signature in database
GPG Key ID: 4B02ED204C7D93F4
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/ci/cherry_pick.py
View File

@ -58,7 +58,7 @@ class ReleaseBranch:
CHERRYPICK_DESCRIPTION = """Original pull-request #{pr_number}
This pull-request is a first step of an automated backporting.
It contains changes like after calling a local command `git cherry-pick`.
It contains changes similar to calling a local command `git cherry-pick`.
If you intend to continue backporting this changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.
@ -66,19 +66,25 @@ The check results does not matter at this step - you can safely ignore them.
### Note
This pull-request will be merged automatically as it reaches the mergeable state, \
**do not merge it manually**. It's 100% safe, but completely meaningless.
This pull-request will be merged automatically. Please, **do not merge it manually** \
(but if you accidentally did, nothing bad will happen).
### If the PR was closed and then reopened
### If the PR was manually reopened after being closed
If it stuck (e.g. for a day), check {pr_url} for `{backport_created_label}` *label* and \
delete it if necessary. Manually merging will do nothing, since \
`{backport_created_label}` *label* prevents the original PR {pr_url} from being \
processed.
If this PR is stuck (i.e. not automatically merged after one day), check {pr_url} for \
`{backport_created_label}` *label* and delete it.
If the cherry-pick PR is completely screwed, and you want to recreate it: delete the \
`{label_cherrypick}` label and delete this branch.
You may also need to delete the `{backport_created_label}` label from the original PR.
Manually merging will do nothing. The `{backport_created_label}` *label* prevents the \
original PR {pr_url} from being processed.
If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you \
want to recreate it:
- delete the `{label_cherrypick}` label from the PR
- delete this branch from the repository
You also need to check the original PR {pr_url} for `{backport_created_label}`, and \
delete if it's presented there
"""
BACKPORT_DESCRIPTION = """This pull-request is a last step of an automated \
backporting.