Yes, I agree. We need to have a guideline for PR cherry-picking.
I'm not sure if we have other tools for cherry-picking.
We can provide the Git cherry-pick procedure in the document
And point out what we should not do, such as push a test fix
or code-style fix without CR.
I will try to draft a doc
On a practical note, do we understand what went wrong and how to
prevent it in the future? Do we need to improve cherry-picking
documentation or tooling for committers?
- Michael
On Tue, Nov 29, 2022 at 3:41 AM PengHui Li wrote:
>
> It's not only two commits
> There are more than 10 commits with
It's not only two commits
There are more than 10 commits with meaningless commit messages.
Please check the commit logs
https://github.com/apache/pulsar/tree/branch-2.9-backup
> Prettifying the git commit history isn't a proper reason to do force
pushes
I don't think it should be `Prettifying` he
+1 to what Michael said.
If an invalid commit gets pushed into one of the public branches, it will
simply need to be reverted. Prettifying the git commit history isn't a proper
reason to do force pushes. There could be special exceptions, such as when
someone accidentally pushes confidential in
I do not think we should have done a force push to rewrite two commit
messages. The problematic messages had commit hashes in their names,
so it was easy enough to figure out what went wrong and how to find
the original commit. If it was really important to fix the messages, I
think we should have
+3 binding(Penghui Li, JiWei guo, Hang Chen) +2 nonbing(Zike Yang,
Yubiao Feng), so I will close this discussion and merge
https://github.com/apache/pulsar/pull/18623. thanks for your votes.
Thanks,
bo
丛搏 于2022年11月25日周五 18:55写道：
>
> >
> > One thing I'd like to make clear: this is a temporary sol
>
> One thing I'd like to make clear: this is a temporary solution, and we'll
> re-enable branch protection after the actions are performed (or relax to
> 2.9.4 released).
yes, after this pr: https://github.com/apache/pulsar/pull/18623 merged
and reset branch-2.9 to commit 5ed247de3a, I will push
One thing I'd like to make clear: this is a temporary solution, and we'll
re-enable branch protection after the actions are performed (or relax to 2.9.4
released).
If it's the case, please file an issue and assign yourself to revert on time :)
On 2022/11/25 04:28:45 丛搏 wrote:
> Hi, pulsar commu
+1
Thanks
Zike Yang
On Fri, Nov 25, 2022 at 2:22 PM Hang Chen wrote:
>
> +1 for re-cherry-picking the commits.
>
> Thanks,
> Hang
>
> Yubiao Feng 于2022年11月25日周五 13:58写道：
> >
> > +1 for re-cherry-pick the commits.
> >
> > On Fri, Nov 25, 2022 at 12:29 PM 丛搏 wrote:
> >
> > > Hi, pulsar community
+1 for re-cherry-picking the commits.
Thanks,
Hang
Yubiao Feng 于2022年11月25日周五 13:58写道：
>
> +1 for re-cherry-pick the commits.
>
> On Fri, Nov 25, 2022 at 12:29 PM 丛搏 wrote:
>
> > Hi, pulsar community,
> >
> > I am sorry for that, there is no commit to execute cherry-pick
> > --continue, resulti
+1 for re-cherry-pick the commits.
On Fri, Nov 25, 2022 at 12:29 PM 丛搏 wrote:
> Hi, pulsar community,
>
> I am sorry for that, there is no commit to execute cherry-pick
> --continue, resulting in many cherry-pick commit messages not being
> correct[1]. So re-cherry-pick, now requires enabling br
+1 for re-cherry-pick the commits.
Regards
Jiwei Guo (Tboy)
On Fri, Nov 25, 2022 at 1:10 PM PengHui Li wrote:
> Hi Bo,
>
> Thanks for raising the discussion.
>
> +1 for re-cherry-pick the commits.
> The misleading commit logs will confuse users.
>
> Regards,
> Penghui
>
> On Fri, Nov 25, 2022
Hi Bo,
Thanks for raising the discussion.
+1 for re-cherry-pick the commits.
The misleading commit logs will confuse users.
Regards,
Penghui
On Fri, Nov 25, 2022 at 12:29 PM 丛搏 wrote:
> Hi, pulsar community,
>
> I am sorry for that, there is no commit to execute cherry-pick
> --continue, resu
Hi, pulsar community,
I am sorry for that, there is no commit to execute cherry-pick
--continue, resulting in many cherry-pick commit messages not being
correct[1]. So re-cherry-pick, now requires enabling branch-2.9 force
push and frozen branch-2.9.
reset commit 5ed247de3a.
now branch-2.9 has c
14 matches
Mail list logo
