You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@kie.apache.org by Toshiya Kobayashi <to...@gmail.com> on 2025/05/07 07:02:17 UTC
[HEADS-UP] drools-docs moves under incubator-kie-docs
Hi all,
I have filed a PR to move incubator-kie-drools/drools-docs under
incubator-kie-docs in order to resolve a license issue.
https://github.com/apache/incubator-kie-docs/pull/4545
Once merged, I will remove drools-docs from incubator-kie-drools:main.
This is just a heads-up and I hope it's not something to require a vote.
Regards,
Toshiya
Re: [HEADS-UP] drools-docs moves under incubator-kie-docs
Posted by Toshiya Kobayashi <to...@gmail.com>.
> I'm going to split the PR to 10 PRs
like this...
https://github.com/apache/incubator-kie-docs/pull/4550
On Thu, May 8, 2025 at 4:44 PM Toshiya Kobayashi <to...@gmail.com>
wrote:
> Ouch, there is a severe limitation:
>
>
> https://docs.github.com/en/repositories/creating-and-managing-repositories/repository-limits#rebase-limits
>
> Rebase limits
> ===
> Merging a pull request using the "Rebase and merge" option is limited to
> 100 commits. If you have a pull request with more than 100 commits, you
> need to create a merge commit, squash and merge, or split the commits up
> into multiple pull requests.
> ===
>
> My PR has 988 commits. There might be a workaround, but I'm going to split
> the PR to 10 PRs, which is straightforward.
>
> Toshiya
>
> On Thu, May 8, 2025 at 3:37 PM Toshiya Kobayashi <
> toshiyakobayashi@gmail.com> wrote:
>
>> I posted the steps to move the commit history.
>>
>> https://github.com/apache/incubator-kie-docs/pull/4545#issuecomment-2861255969
>>
>> However, I found that the PR cannot "Rebase and merge" in github UI, even
>> though it has been rebased with upstream/main locally.
>>
>> Probably the steps are okay for other docs. drools-docs has a long commit
>> history including migration from another repo, so it makes the commit
>> messy. I'm investigating now...
>>
>> Toshiya
>>
>>
>> On Wed, May 7, 2025 at 10:17 PM Tiago Bento <ti...@apache.org>
>> wrote:
>>
>>> Thank you Toshiya! Great initiative. Do you think this PR is enough
>>> for people doing the same for other docs? Maybe some pointers on how
>>> you were able to keep the commit history, for example? Thanks!!
>>>
>>> On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi
>>> <to...@gmail.com> wrote:
>>> >
>>> > Hi all,
>>> >
>>> > I have filed a PR to move incubator-kie-drools/drools-docs under
>>> > incubator-kie-docs in order to resolve a license issue.
>>> >
>>> > https://github.com/apache/incubator-kie-docs/pull/4545
>>> >
>>> > Once merged, I will remove drools-docs from incubator-kie-drools:main.
>>> >
>>> > This is just a heads-up and I hope it's not something to require a
>>> vote.
>>> >
>>> > Regards,
>>> > Toshiya
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
>>> For additional commands, e-mail: dev-help@kie.apache.org
>>>
>>>
Re: [HEADS-UP] drools-docs moves under incubator-kie-docs
Posted by Toshiya Kobayashi <to...@gmail.com>.
All merged. Thanks!
Toshiya
On Thu, May 8, 2025 at 7:58 PM Toshiya Kobayashi <to...@gmail.com>
wrote:
> I got approvals from Toni and Mario. So I'll go ahead.
>
> > Given that ideally we want preserve history and the concepts of changes
> > already been reviewed and approved, I’d push directly the changes
> without a
> > PR.
>
> Okay, I'll go for a direct push next time.
>
> This time, I have already started the work (PRs) and I think it wouldn't
> take much time and the result will be the same (preserves the commit
> history).
>
> Thanks,
> Toshiya
>
>
> On Thu, May 8, 2025 at 6:56 PM Alex Porcelli <po...@apache.org> wrote:
>
>> Toshiya,
>>
>> Given that ideally we want preserve history and the concepts of changes
>> already been reviewed and approved, I’d push directly the changes without
>> a
>> PR.
>>
>> Worst case, changes can always been reverted
>>
>> -
>> Alex
>>
>>
>> On Thu, May 8, 2025 at 5:38 AM Toni Rikkola <tr...@redhat.com.invalid>
>> wrote:
>>
>> > Go ahead. It is an isolated and new folder. If there are issues they are
>> > easier fixed than it is to get these in any other way.
>> >
>> > Toni
>> >
>> > On Thu, May 8, 2025 at 12:24 PM Toshiya Kobayashi <
>> > toshiyakobayashi@gmail.com> wrote:
>> >
>> > > Btw, I'm setting reviewers (Toni, Mario, Dominik, Alex, Yeser) on the
>> > split
>> > > PRs. If at least two of the reviewers are okay with the original PR (
>> > > https://github.com/apache/incubator-kie-docs/pull/4545), I can assume
>> > that
>> > > I get approvals on the split PRs, so I would merge them immediately
>> > without
>> > > bothering you with zulip ping. So if you are okay with the original
>> PR,
>> > > please give Ack on this mail thread. Thanks!
>> > >
>> > >
>> > > On Thu, May 8, 2025 at 5:54 PM Toshiya Kobayashi <
>> > > toshiyakobayashi@gmail.com>
>> > > wrote:
>> > >
>> > > > Thank you for the suggestion, Fabrizio.
>> > > >
>> > > > I have started the split PRs as I thought that 10 PRs is an
>> acceptable
>> > > > workload.
>> > > >
>> > > > Of course, it's worth discussing the exceptional procedure, so we
>> will
>> > be
>> > > > ready for a future similar case.
>> > > >
>> > > > Thanks,
>> > > > Toshiya
>> > > >
>> > > > On Thu, May 8, 2025 at 5:09 PM Fabrizio Antonangeli <
>> > > > fantonangeli@apache.org> wrote:
>> > > >
>> > > >> Otherwise, if the PR is already reviewed and people agree, I think
>> > > >> merging manually (without squashing) and push directly on `main`
>> > > >> without GH Web, can be an easier option.
>> > > >> I would suggest keeping a copy of the current `main` branch, to be
>> > > >> safe, as the past git history will change.
>> > > >> This way you avoid creating 10 PRs, ask for reviews, then merge.
>> > > >> Let's see other's opinion.
>> > > >>
>> > > >> On Thu, 2025-05-08 at 16:44 +0900, Toshiya Kobayashi wrote:
>> > > >> > Ouch, there is a severe limitation:
>> > > >> >
>> > > >> >
>> > > >>
>> > >
>> >
>> https://docs.github.com/en/repositories/creating-and-managing-repositories/repository-limits#rebase-limits
>> > > >> >
>> > > >> > Rebase limits
>> > > >> > ===
>> > > >> > Merging a pull request using the "Rebase and merge" option is
>> > limited
>> > > >> > to
>> > > >> > 100 commits. If you have a pull request with more than 100
>> commits,
>> > > >> > you
>> > > >> > need to create a merge commit, squash and merge, or split the
>> > commits
>> > > >> > up
>> > > >> > into multiple pull requests.
>> > > >> > ===
>> > > >> >
>> > > >> > My PR has 988 commits. There might be a workaround, but I'm
>> going to
>> > > >> > split
>> > > >> > the PR to 10 PRs, which is straightforward.
>> > > >> >
>> > > >> > Toshiya
>> > > >> >
>> > > >> > On Thu, May 8, 2025 at 3:37 PM Toshiya Kobayashi
>> > > >> > <to...@gmail.com>
>> > > >> > wrote:
>> > > >> >
>> > > >> > > I posted the steps to move the commit history.
>> > > >> > >
>> > > >> > >
>> > > >>
>> > >
>> >
>> https://github.com/apache/incubator-kie-docs/pull/4545#issuecomment-2861255969
>> > > >> > >
>> > > >> > > However, I found that the PR cannot "Rebase and merge" in
>> github
>> > > >> > > UI, even
>> > > >> > > though it has been rebased with upstream/main locally.
>> > > >> > >
>> > > >> > > Probably the steps are okay for other docs. drools-docs has a
>> long
>> > > >> > > commit
>> > > >> > > history including migration from another repo, so it makes the
>> > > >> > > commit
>> > > >> > > messy. I'm investigating now...
>> > > >> > >
>> > > >> > > Toshiya
>> > > >> > >
>> > > >> > >
>> > > >> > > On Wed, May 7, 2025 at 10:17 PM Tiago Bento <
>> > tiagobento@apache.org>
>> > > >> > > wrote:
>> > > >> > >
>> > > >> > > > Thank you Toshiya! Great initiative. Do you think this PR is
>> > > >> > > > enough
>> > > >> > > > for people doing the same for other docs? Maybe some
>> pointers on
>> > > >> > > > how
>> > > >> > > > you were able to keep the commit history, for example?
>> Thanks!!
>> > > >> > > >
>> > > >> > > > On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi
>> > > >> > > > <to...@gmail.com> wrote:
>> > > >> > > > >
>> > > >> > > > > Hi all,
>> > > >> > > > >
>> > > >> > > > > I have filed a PR to move incubator-kie-drools/drools-docs
>> > > >> > > > > under
>> > > >> > > > > incubator-kie-docs in order to resolve a license issue.
>> > > >> > > > >
>> > > >> > > > > https://github.com/apache/incubator-kie-docs/pull/4545
>> > > >> > > > >
>> > > >> > > > > Once merged, I will remove drools-docs from incubator-kie-
>> > > >> > > > > drools:main.
>> > > >> > > > >
>> > > >> > > > > This is just a heads-up and I hope it's not something to
>> > > >> > > > > require a vote.
>> > > >> > > > >
>> > > >> > > > > Regards,
>> > > >> > > > > Toshiya
>> > > >> > > >
>> > > >> > > >
>> > -----------------------------------------------------------------
>> > > >> > > > ----
>> > > >> > > > To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
>> > > >> > > > For additional commands, e-mail: dev-help@kie.apache.org
>> > > >> > > >
>> > > >> > > >
>> > > >>
>> > > >>
>> ---------------------------------------------------------------------
>> > > >> To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
>> > > >> For additional commands, e-mail: dev-help@kie.apache.org
>> > > >>
>> > > >>
>> > >
>> >
>>
>
Re: [HEADS-UP] drools-docs moves under incubator-kie-docs
Posted by Toshiya Kobayashi <to...@gmail.com>.
I got approvals from Toni and Mario. So I'll go ahead.
> Given that ideally we want preserve history and the concepts of changes
> already been reviewed and approved, I’d push directly the changes without
a
> PR.
Okay, I'll go for a direct push next time.
This time, I have already started the work (PRs) and I think it wouldn't
take much time and the result will be the same (preserves the commit
history).
Thanks,
Toshiya
On Thu, May 8, 2025 at 6:56 PM Alex Porcelli <po...@apache.org> wrote:
> Toshiya,
>
> Given that ideally we want preserve history and the concepts of changes
> already been reviewed and approved, I’d push directly the changes without a
> PR.
>
> Worst case, changes can always been reverted
>
> -
> Alex
>
>
> On Thu, May 8, 2025 at 5:38 AM Toni Rikkola <tr...@redhat.com.invalid>
> wrote:
>
> > Go ahead. It is an isolated and new folder. If there are issues they are
> > easier fixed than it is to get these in any other way.
> >
> > Toni
> >
> > On Thu, May 8, 2025 at 12:24 PM Toshiya Kobayashi <
> > toshiyakobayashi@gmail.com> wrote:
> >
> > > Btw, I'm setting reviewers (Toni, Mario, Dominik, Alex, Yeser) on the
> > split
> > > PRs. If at least two of the reviewers are okay with the original PR (
> > > https://github.com/apache/incubator-kie-docs/pull/4545), I can assume
> > that
> > > I get approvals on the split PRs, so I would merge them immediately
> > without
> > > bothering you with zulip ping. So if you are okay with the original PR,
> > > please give Ack on this mail thread. Thanks!
> > >
> > >
> > > On Thu, May 8, 2025 at 5:54 PM Toshiya Kobayashi <
> > > toshiyakobayashi@gmail.com>
> > > wrote:
> > >
> > > > Thank you for the suggestion, Fabrizio.
> > > >
> > > > I have started the split PRs as I thought that 10 PRs is an
> acceptable
> > > > workload.
> > > >
> > > > Of course, it's worth discussing the exceptional procedure, so we
> will
> > be
> > > > ready for a future similar case.
> > > >
> > > > Thanks,
> > > > Toshiya
> > > >
> > > > On Thu, May 8, 2025 at 5:09 PM Fabrizio Antonangeli <
> > > > fantonangeli@apache.org> wrote:
> > > >
> > > >> Otherwise, if the PR is already reviewed and people agree, I think
> > > >> merging manually (without squashing) and push directly on `main`
> > > >> without GH Web, can be an easier option.
> > > >> I would suggest keeping a copy of the current `main` branch, to be
> > > >> safe, as the past git history will change.
> > > >> This way you avoid creating 10 PRs, ask for reviews, then merge.
> > > >> Let's see other's opinion.
> > > >>
> > > >> On Thu, 2025-05-08 at 16:44 +0900, Toshiya Kobayashi wrote:
> > > >> > Ouch, there is a severe limitation:
> > > >> >
> > > >> >
> > > >>
> > >
> >
> https://docs.github.com/en/repositories/creating-and-managing-repositories/repository-limits#rebase-limits
> > > >> >
> > > >> > Rebase limits
> > > >> > ===
> > > >> > Merging a pull request using the "Rebase and merge" option is
> > limited
> > > >> > to
> > > >> > 100 commits. If you have a pull request with more than 100
> commits,
> > > >> > you
> > > >> > need to create a merge commit, squash and merge, or split the
> > commits
> > > >> > up
> > > >> > into multiple pull requests.
> > > >> > ===
> > > >> >
> > > >> > My PR has 988 commits. There might be a workaround, but I'm going
> to
> > > >> > split
> > > >> > the PR to 10 PRs, which is straightforward.
> > > >> >
> > > >> > Toshiya
> > > >> >
> > > >> > On Thu, May 8, 2025 at 3:37 PM Toshiya Kobayashi
> > > >> > <to...@gmail.com>
> > > >> > wrote:
> > > >> >
> > > >> > > I posted the steps to move the commit history.
> > > >> > >
> > > >> > >
> > > >>
> > >
> >
> https://github.com/apache/incubator-kie-docs/pull/4545#issuecomment-2861255969
> > > >> > >
> > > >> > > However, I found that the PR cannot "Rebase and merge" in github
> > > >> > > UI, even
> > > >> > > though it has been rebased with upstream/main locally.
> > > >> > >
> > > >> > > Probably the steps are okay for other docs. drools-docs has a
> long
> > > >> > > commit
> > > >> > > history including migration from another repo, so it makes the
> > > >> > > commit
> > > >> > > messy. I'm investigating now...
> > > >> > >
> > > >> > > Toshiya
> > > >> > >
> > > >> > >
> > > >> > > On Wed, May 7, 2025 at 10:17 PM Tiago Bento <
> > tiagobento@apache.org>
> > > >> > > wrote:
> > > >> > >
> > > >> > > > Thank you Toshiya! Great initiative. Do you think this PR is
> > > >> > > > enough
> > > >> > > > for people doing the same for other docs? Maybe some pointers
> on
> > > >> > > > how
> > > >> > > > you were able to keep the commit history, for example?
> Thanks!!
> > > >> > > >
> > > >> > > > On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi
> > > >> > > > <to...@gmail.com> wrote:
> > > >> > > > >
> > > >> > > > > Hi all,
> > > >> > > > >
> > > >> > > > > I have filed a PR to move incubator-kie-drools/drools-docs
> > > >> > > > > under
> > > >> > > > > incubator-kie-docs in order to resolve a license issue.
> > > >> > > > >
> > > >> > > > > https://github.com/apache/incubator-kie-docs/pull/4545
> > > >> > > > >
> > > >> > > > > Once merged, I will remove drools-docs from incubator-kie-
> > > >> > > > > drools:main.
> > > >> > > > >
> > > >> > > > > This is just a heads-up and I hope it's not something to
> > > >> > > > > require a vote.
> > > >> > > > >
> > > >> > > > > Regards,
> > > >> > > > > Toshiya
> > > >> > > >
> > > >> > > >
> > -----------------------------------------------------------------
> > > >> > > > ----
> > > >> > > > To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
> > > >> > > > For additional commands, e-mail: dev-help@kie.apache.org
> > > >> > > >
> > > >> > > >
> > > >>
> > > >>
> ---------------------------------------------------------------------
> > > >> To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
> > > >> For additional commands, e-mail: dev-help@kie.apache.org
> > > >>
> > > >>
> > >
> >
>
Re: [HEADS-UP] drools-docs moves under incubator-kie-docs
Posted by Alex Porcelli <po...@apache.org>.
Toshiya,
Given that ideally we want preserve history and the concepts of changes
already been reviewed and approved, I’d push directly the changes without a
PR.
Worst case, changes can always been reverted
-
Alex
On Thu, May 8, 2025 at 5:38 AM Toni Rikkola <tr...@redhat.com.invalid>
wrote:
> Go ahead. It is an isolated and new folder. If there are issues they are
> easier fixed than it is to get these in any other way.
>
> Toni
>
> On Thu, May 8, 2025 at 12:24 PM Toshiya Kobayashi <
> toshiyakobayashi@gmail.com> wrote:
>
> > Btw, I'm setting reviewers (Toni, Mario, Dominik, Alex, Yeser) on the
> split
> > PRs. If at least two of the reviewers are okay with the original PR (
> > https://github.com/apache/incubator-kie-docs/pull/4545), I can assume
> that
> > I get approvals on the split PRs, so I would merge them immediately
> without
> > bothering you with zulip ping. So if you are okay with the original PR,
> > please give Ack on this mail thread. Thanks!
> >
> >
> > On Thu, May 8, 2025 at 5:54 PM Toshiya Kobayashi <
> > toshiyakobayashi@gmail.com>
> > wrote:
> >
> > > Thank you for the suggestion, Fabrizio.
> > >
> > > I have started the split PRs as I thought that 10 PRs is an acceptable
> > > workload.
> > >
> > > Of course, it's worth discussing the exceptional procedure, so we will
> be
> > > ready for a future similar case.
> > >
> > > Thanks,
> > > Toshiya
> > >
> > > On Thu, May 8, 2025 at 5:09 PM Fabrizio Antonangeli <
> > > fantonangeli@apache.org> wrote:
> > >
> > >> Otherwise, if the PR is already reviewed and people agree, I think
> > >> merging manually (without squashing) and push directly on `main`
> > >> without GH Web, can be an easier option.
> > >> I would suggest keeping a copy of the current `main` branch, to be
> > >> safe, as the past git history will change.
> > >> This way you avoid creating 10 PRs, ask for reviews, then merge.
> > >> Let's see other's opinion.
> > >>
> > >> On Thu, 2025-05-08 at 16:44 +0900, Toshiya Kobayashi wrote:
> > >> > Ouch, there is a severe limitation:
> > >> >
> > >> >
> > >>
> >
> https://docs.github.com/en/repositories/creating-and-managing-repositories/repository-limits#rebase-limits
> > >> >
> > >> > Rebase limits
> > >> > ===
> > >> > Merging a pull request using the "Rebase and merge" option is
> limited
> > >> > to
> > >> > 100 commits. If you have a pull request with more than 100 commits,
> > >> > you
> > >> > need to create a merge commit, squash and merge, or split the
> commits
> > >> > up
> > >> > into multiple pull requests.
> > >> > ===
> > >> >
> > >> > My PR has 988 commits. There might be a workaround, but I'm going to
> > >> > split
> > >> > the PR to 10 PRs, which is straightforward.
> > >> >
> > >> > Toshiya
> > >> >
> > >> > On Thu, May 8, 2025 at 3:37 PM Toshiya Kobayashi
> > >> > <to...@gmail.com>
> > >> > wrote:
> > >> >
> > >> > > I posted the steps to move the commit history.
> > >> > >
> > >> > >
> > >>
> >
> https://github.com/apache/incubator-kie-docs/pull/4545#issuecomment-2861255969
> > >> > >
> > >> > > However, I found that the PR cannot "Rebase and merge" in github
> > >> > > UI, even
> > >> > > though it has been rebased with upstream/main locally.
> > >> > >
> > >> > > Probably the steps are okay for other docs. drools-docs has a long
> > >> > > commit
> > >> > > history including migration from another repo, so it makes the
> > >> > > commit
> > >> > > messy. I'm investigating now...
> > >> > >
> > >> > > Toshiya
> > >> > >
> > >> > >
> > >> > > On Wed, May 7, 2025 at 10:17 PM Tiago Bento <
> tiagobento@apache.org>
> > >> > > wrote:
> > >> > >
> > >> > > > Thank you Toshiya! Great initiative. Do you think this PR is
> > >> > > > enough
> > >> > > > for people doing the same for other docs? Maybe some pointers on
> > >> > > > how
> > >> > > > you were able to keep the commit history, for example? Thanks!!
> > >> > > >
> > >> > > > On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi
> > >> > > > <to...@gmail.com> wrote:
> > >> > > > >
> > >> > > > > Hi all,
> > >> > > > >
> > >> > > > > I have filed a PR to move incubator-kie-drools/drools-docs
> > >> > > > > under
> > >> > > > > incubator-kie-docs in order to resolve a license issue.
> > >> > > > >
> > >> > > > > https://github.com/apache/incubator-kie-docs/pull/4545
> > >> > > > >
> > >> > > > > Once merged, I will remove drools-docs from incubator-kie-
> > >> > > > > drools:main.
> > >> > > > >
> > >> > > > > This is just a heads-up and I hope it's not something to
> > >> > > > > require a vote.
> > >> > > > >
> > >> > > > > Regards,
> > >> > > > > Toshiya
> > >> > > >
> > >> > > >
> -----------------------------------------------------------------
> > >> > > > ----
> > >> > > > To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
> > >> > > > For additional commands, e-mail: dev-help@kie.apache.org
> > >> > > >
> > >> > > >
> > >>
> > >> ---------------------------------------------------------------------
> > >> To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
> > >> For additional commands, e-mail: dev-help@kie.apache.org
> > >>
> > >>
> >
>
Re: [HEADS-UP] drools-docs moves under incubator-kie-docs
Posted by Toni Rikkola <tr...@redhat.com.INVALID>.
Go ahead. It is an isolated and new folder. If there are issues they are
easier fixed than it is to get these in any other way.
Toni
On Thu, May 8, 2025 at 12:24 PM Toshiya Kobayashi <
toshiyakobayashi@gmail.com> wrote:
> Btw, I'm setting reviewers (Toni, Mario, Dominik, Alex, Yeser) on the split
> PRs. If at least two of the reviewers are okay with the original PR (
> https://github.com/apache/incubator-kie-docs/pull/4545), I can assume that
> I get approvals on the split PRs, so I would merge them immediately without
> bothering you with zulip ping. So if you are okay with the original PR,
> please give Ack on this mail thread. Thanks!
>
>
> On Thu, May 8, 2025 at 5:54 PM Toshiya Kobayashi <
> toshiyakobayashi@gmail.com>
> wrote:
>
> > Thank you for the suggestion, Fabrizio.
> >
> > I have started the split PRs as I thought that 10 PRs is an acceptable
> > workload.
> >
> > Of course, it's worth discussing the exceptional procedure, so we will be
> > ready for a future similar case.
> >
> > Thanks,
> > Toshiya
> >
> > On Thu, May 8, 2025 at 5:09 PM Fabrizio Antonangeli <
> > fantonangeli@apache.org> wrote:
> >
> >> Otherwise, if the PR is already reviewed and people agree, I think
> >> merging manually (without squashing) and push directly on `main`
> >> without GH Web, can be an easier option.
> >> I would suggest keeping a copy of the current `main` branch, to be
> >> safe, as the past git history will change.
> >> This way you avoid creating 10 PRs, ask for reviews, then merge.
> >> Let's see other's opinion.
> >>
> >> On Thu, 2025-05-08 at 16:44 +0900, Toshiya Kobayashi wrote:
> >> > Ouch, there is a severe limitation:
> >> >
> >> >
> >>
> https://docs.github.com/en/repositories/creating-and-managing-repositories/repository-limits#rebase-limits
> >> >
> >> > Rebase limits
> >> > ===
> >> > Merging a pull request using the "Rebase and merge" option is limited
> >> > to
> >> > 100 commits. If you have a pull request with more than 100 commits,
> >> > you
> >> > need to create a merge commit, squash and merge, or split the commits
> >> > up
> >> > into multiple pull requests.
> >> > ===
> >> >
> >> > My PR has 988 commits. There might be a workaround, but I'm going to
> >> > split
> >> > the PR to 10 PRs, which is straightforward.
> >> >
> >> > Toshiya
> >> >
> >> > On Thu, May 8, 2025 at 3:37 PM Toshiya Kobayashi
> >> > <to...@gmail.com>
> >> > wrote:
> >> >
> >> > > I posted the steps to move the commit history.
> >> > >
> >> > >
> >>
> https://github.com/apache/incubator-kie-docs/pull/4545#issuecomment-2861255969
> >> > >
> >> > > However, I found that the PR cannot "Rebase and merge" in github
> >> > > UI, even
> >> > > though it has been rebased with upstream/main locally.
> >> > >
> >> > > Probably the steps are okay for other docs. drools-docs has a long
> >> > > commit
> >> > > history including migration from another repo, so it makes the
> >> > > commit
> >> > > messy. I'm investigating now...
> >> > >
> >> > > Toshiya
> >> > >
> >> > >
> >> > > On Wed, May 7, 2025 at 10:17 PM Tiago Bento <ti...@apache.org>
> >> > > wrote:
> >> > >
> >> > > > Thank you Toshiya! Great initiative. Do you think this PR is
> >> > > > enough
> >> > > > for people doing the same for other docs? Maybe some pointers on
> >> > > > how
> >> > > > you were able to keep the commit history, for example? Thanks!!
> >> > > >
> >> > > > On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi
> >> > > > <to...@gmail.com> wrote:
> >> > > > >
> >> > > > > Hi all,
> >> > > > >
> >> > > > > I have filed a PR to move incubator-kie-drools/drools-docs
> >> > > > > under
> >> > > > > incubator-kie-docs in order to resolve a license issue.
> >> > > > >
> >> > > > > https://github.com/apache/incubator-kie-docs/pull/4545
> >> > > > >
> >> > > > > Once merged, I will remove drools-docs from incubator-kie-
> >> > > > > drools:main.
> >> > > > >
> >> > > > > This is just a heads-up and I hope it's not something to
> >> > > > > require a vote.
> >> > > > >
> >> > > > > Regards,
> >> > > > > Toshiya
> >> > > >
> >> > > > -----------------------------------------------------------------
> >> > > > ----
> >> > > > To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
> >> > > > For additional commands, e-mail: dev-help@kie.apache.org
> >> > > >
> >> > > >
> >>
> >> ---------------------------------------------------------------------
> >> To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
> >> For additional commands, e-mail: dev-help@kie.apache.org
> >>
> >>
>
Re: [HEADS-UP] drools-docs moves under incubator-kie-docs
Posted by Toshiya Kobayashi <to...@gmail.com>.
Btw, I'm setting reviewers (Toni, Mario, Dominik, Alex, Yeser) on the split
PRs. If at least two of the reviewers are okay with the original PR (
https://github.com/apache/incubator-kie-docs/pull/4545), I can assume that
I get approvals on the split PRs, so I would merge them immediately without
bothering you with zulip ping. So if you are okay with the original PR,
please give Ack on this mail thread. Thanks!
On Thu, May 8, 2025 at 5:54 PM Toshiya Kobayashi <to...@gmail.com>
wrote:
> Thank you for the suggestion, Fabrizio.
>
> I have started the split PRs as I thought that 10 PRs is an acceptable
> workload.
>
> Of course, it's worth discussing the exceptional procedure, so we will be
> ready for a future similar case.
>
> Thanks,
> Toshiya
>
> On Thu, May 8, 2025 at 5:09 PM Fabrizio Antonangeli <
> fantonangeli@apache.org> wrote:
>
>> Otherwise, if the PR is already reviewed and people agree, I think
>> merging manually (without squashing) and push directly on `main`
>> without GH Web, can be an easier option.
>> I would suggest keeping a copy of the current `main` branch, to be
>> safe, as the past git history will change.
>> This way you avoid creating 10 PRs, ask for reviews, then merge.
>> Let's see other's opinion.
>>
>> On Thu, 2025-05-08 at 16:44 +0900, Toshiya Kobayashi wrote:
>> > Ouch, there is a severe limitation:
>> >
>> >
>> https://docs.github.com/en/repositories/creating-and-managing-repositories/repository-limits#rebase-limits
>> >
>> > Rebase limits
>> > ===
>> > Merging a pull request using the "Rebase and merge" option is limited
>> > to
>> > 100 commits. If you have a pull request with more than 100 commits,
>> > you
>> > need to create a merge commit, squash and merge, or split the commits
>> > up
>> > into multiple pull requests.
>> > ===
>> >
>> > My PR has 988 commits. There might be a workaround, but I'm going to
>> > split
>> > the PR to 10 PRs, which is straightforward.
>> >
>> > Toshiya
>> >
>> > On Thu, May 8, 2025 at 3:37 PM Toshiya Kobayashi
>> > <to...@gmail.com>
>> > wrote:
>> >
>> > > I posted the steps to move the commit history.
>> > >
>> > >
>> https://github.com/apache/incubator-kie-docs/pull/4545#issuecomment-2861255969
>> > >
>> > > However, I found that the PR cannot "Rebase and merge" in github
>> > > UI, even
>> > > though it has been rebased with upstream/main locally.
>> > >
>> > > Probably the steps are okay for other docs. drools-docs has a long
>> > > commit
>> > > history including migration from another repo, so it makes the
>> > > commit
>> > > messy. I'm investigating now...
>> > >
>> > > Toshiya
>> > >
>> > >
>> > > On Wed, May 7, 2025 at 10:17 PM Tiago Bento <ti...@apache.org>
>> > > wrote:
>> > >
>> > > > Thank you Toshiya! Great initiative. Do you think this PR is
>> > > > enough
>> > > > for people doing the same for other docs? Maybe some pointers on
>> > > > how
>> > > > you were able to keep the commit history, for example? Thanks!!
>> > > >
>> > > > On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi
>> > > > <to...@gmail.com> wrote:
>> > > > >
>> > > > > Hi all,
>> > > > >
>> > > > > I have filed a PR to move incubator-kie-drools/drools-docs
>> > > > > under
>> > > > > incubator-kie-docs in order to resolve a license issue.
>> > > > >
>> > > > > https://github.com/apache/incubator-kie-docs/pull/4545
>> > > > >
>> > > > > Once merged, I will remove drools-docs from incubator-kie-
>> > > > > drools:main.
>> > > > >
>> > > > > This is just a heads-up and I hope it's not something to
>> > > > > require a vote.
>> > > > >
>> > > > > Regards,
>> > > > > Toshiya
>> > > >
>> > > > -----------------------------------------------------------------
>> > > > ----
>> > > > To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
>> > > > For additional commands, e-mail: dev-help@kie.apache.org
>> > > >
>> > > >
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
>> For additional commands, e-mail: dev-help@kie.apache.org
>>
>>
Re: [HEADS-UP] drools-docs moves under incubator-kie-docs
Posted by Toshiya Kobayashi <to...@gmail.com>.
Thank you for the suggestion, Fabrizio.
I have started the split PRs as I thought that 10 PRs is an acceptable
workload.
Of course, it's worth discussing the exceptional procedure, so we will be
ready for a future similar case.
Thanks,
Toshiya
On Thu, May 8, 2025 at 5:09 PM Fabrizio Antonangeli <fa...@apache.org>
wrote:
> Otherwise, if the PR is already reviewed and people agree, I think
> merging manually (without squashing) and push directly on `main`
> without GH Web, can be an easier option.
> I would suggest keeping a copy of the current `main` branch, to be
> safe, as the past git history will change.
> This way you avoid creating 10 PRs, ask for reviews, then merge.
> Let's see other's opinion.
>
> On Thu, 2025-05-08 at 16:44 +0900, Toshiya Kobayashi wrote:
> > Ouch, there is a severe limitation:
> >
> >
> https://docs.github.com/en/repositories/creating-and-managing-repositories/repository-limits#rebase-limits
> >
> > Rebase limits
> > ===
> > Merging a pull request using the "Rebase and merge" option is limited
> > to
> > 100 commits. If you have a pull request with more than 100 commits,
> > you
> > need to create a merge commit, squash and merge, or split the commits
> > up
> > into multiple pull requests.
> > ===
> >
> > My PR has 988 commits. There might be a workaround, but I'm going to
> > split
> > the PR to 10 PRs, which is straightforward.
> >
> > Toshiya
> >
> > On Thu, May 8, 2025 at 3:37 PM Toshiya Kobayashi
> > <to...@gmail.com>
> > wrote:
> >
> > > I posted the steps to move the commit history.
> > >
> > >
> https://github.com/apache/incubator-kie-docs/pull/4545#issuecomment-2861255969
> > >
> > > However, I found that the PR cannot "Rebase and merge" in github
> > > UI, even
> > > though it has been rebased with upstream/main locally.
> > >
> > > Probably the steps are okay for other docs. drools-docs has a long
> > > commit
> > > history including migration from another repo, so it makes the
> > > commit
> > > messy. I'm investigating now...
> > >
> > > Toshiya
> > >
> > >
> > > On Wed, May 7, 2025 at 10:17 PM Tiago Bento <ti...@apache.org>
> > > wrote:
> > >
> > > > Thank you Toshiya! Great initiative. Do you think this PR is
> > > > enough
> > > > for people doing the same for other docs? Maybe some pointers on
> > > > how
> > > > you were able to keep the commit history, for example? Thanks!!
> > > >
> > > > On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi
> > > > <to...@gmail.com> wrote:
> > > > >
> > > > > Hi all,
> > > > >
> > > > > I have filed a PR to move incubator-kie-drools/drools-docs
> > > > > under
> > > > > incubator-kie-docs in order to resolve a license issue.
> > > > >
> > > > > https://github.com/apache/incubator-kie-docs/pull/4545
> > > > >
> > > > > Once merged, I will remove drools-docs from incubator-kie-
> > > > > drools:main.
> > > > >
> > > > > This is just a heads-up and I hope it's not something to
> > > > > require a vote.
> > > > >
> > > > > Regards,
> > > > > Toshiya
> > > >
> > > > -----------------------------------------------------------------
> > > > ----
> > > > To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
> > > > For additional commands, e-mail: dev-help@kie.apache.org
> > > >
> > > >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
> For additional commands, e-mail: dev-help@kie.apache.org
>
>
Re: [HEADS-UP] drools-docs moves under incubator-kie-docs
Posted by Fabrizio Antonangeli <fa...@apache.org>.
Otherwise, if the PR is already reviewed and people agree, I think
merging manually (without squashing) and push directly on `main`
without GH Web, can be an easier option.
I would suggest keeping a copy of the current `main` branch, to be
safe, as the past git history will change.
This way you avoid creating 10 PRs, ask for reviews, then merge.
Let's see other's opinion.
On Thu, 2025-05-08 at 16:44 +0900, Toshiya Kobayashi wrote:
> Ouch, there is a severe limitation:
>
> https://docs.github.com/en/repositories/creating-and-managing-repositories/repository-limits#rebase-limits
>
> Rebase limits
> ===
> Merging a pull request using the "Rebase and merge" option is limited
> to
> 100 commits. If you have a pull request with more than 100 commits,
> you
> need to create a merge commit, squash and merge, or split the commits
> up
> into multiple pull requests.
> ===
>
> My PR has 988 commits. There might be a workaround, but I'm going to
> split
> the PR to 10 PRs, which is straightforward.
>
> Toshiya
>
> On Thu, May 8, 2025 at 3:37 PM Toshiya Kobayashi
> <to...@gmail.com>
> wrote:
>
> > I posted the steps to move the commit history.
> >
> > https://github.com/apache/incubator-kie-docs/pull/4545#issuecomment-2861255969
> >
> > However, I found that the PR cannot "Rebase and merge" in github
> > UI, even
> > though it has been rebased with upstream/main locally.
> >
> > Probably the steps are okay for other docs. drools-docs has a long
> > commit
> > history including migration from another repo, so it makes the
> > commit
> > messy. I'm investigating now...
> >
> > Toshiya
> >
> >
> > On Wed, May 7, 2025 at 10:17 PM Tiago Bento <ti...@apache.org>
> > wrote:
> >
> > > Thank you Toshiya! Great initiative. Do you think this PR is
> > > enough
> > > for people doing the same for other docs? Maybe some pointers on
> > > how
> > > you were able to keep the commit history, for example? Thanks!!
> > >
> > > On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi
> > > <to...@gmail.com> wrote:
> > > >
> > > > Hi all,
> > > >
> > > > I have filed a PR to move incubator-kie-drools/drools-docs
> > > > under
> > > > incubator-kie-docs in order to resolve a license issue.
> > > >
> > > > https://github.com/apache/incubator-kie-docs/pull/4545
> > > >
> > > > Once merged, I will remove drools-docs from incubator-kie-
> > > > drools:main.
> > > >
> > > > This is just a heads-up and I hope it's not something to
> > > > require a vote.
> > > >
> > > > Regards,
> > > > Toshiya
> > >
> > > -----------------------------------------------------------------
> > > ----
> > > To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
> > > For additional commands, e-mail: dev-help@kie.apache.org
> > >
> > >
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
For additional commands, e-mail: dev-help@kie.apache.org
Re: [HEADS-UP] drools-docs moves under incubator-kie-docs
Posted by Toshiya Kobayashi <to...@gmail.com>.
Ouch, there is a severe limitation:
https://docs.github.com/en/repositories/creating-and-managing-repositories/repository-limits#rebase-limits
Rebase limits
===
Merging a pull request using the "Rebase and merge" option is limited to
100 commits. If you have a pull request with more than 100 commits, you
need to create a merge commit, squash and merge, or split the commits up
into multiple pull requests.
===
My PR has 988 commits. There might be a workaround, but I'm going to split
the PR to 10 PRs, which is straightforward.
Toshiya
On Thu, May 8, 2025 at 3:37 PM Toshiya Kobayashi <to...@gmail.com>
wrote:
> I posted the steps to move the commit history.
>
> https://github.com/apache/incubator-kie-docs/pull/4545#issuecomment-2861255969
>
> However, I found that the PR cannot "Rebase and merge" in github UI, even
> though it has been rebased with upstream/main locally.
>
> Probably the steps are okay for other docs. drools-docs has a long commit
> history including migration from another repo, so it makes the commit
> messy. I'm investigating now...
>
> Toshiya
>
>
> On Wed, May 7, 2025 at 10:17 PM Tiago Bento <ti...@apache.org> wrote:
>
>> Thank you Toshiya! Great initiative. Do you think this PR is enough
>> for people doing the same for other docs? Maybe some pointers on how
>> you were able to keep the commit history, for example? Thanks!!
>>
>> On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi
>> <to...@gmail.com> wrote:
>> >
>> > Hi all,
>> >
>> > I have filed a PR to move incubator-kie-drools/drools-docs under
>> > incubator-kie-docs in order to resolve a license issue.
>> >
>> > https://github.com/apache/incubator-kie-docs/pull/4545
>> >
>> > Once merged, I will remove drools-docs from incubator-kie-drools:main.
>> >
>> > This is just a heads-up and I hope it's not something to require a vote.
>> >
>> > Regards,
>> > Toshiya
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
>> For additional commands, e-mail: dev-help@kie.apache.org
>>
>>
Re: [HEADS-UP] drools-docs moves under incubator-kie-docs
Posted by Toshiya Kobayashi <to...@gmail.com>.
I posted the steps to move the commit history.
https://github.com/apache/incubator-kie-docs/pull/4545#issuecomment-2861255969
However, I found that the PR cannot "Rebase and merge" in github UI, even
though it has been rebased with upstream/main locally.
Probably the steps are okay for other docs. drools-docs has a long commit
history including migration from another repo, so it makes the commit
messy. I'm investigating now...
Toshiya
On Wed, May 7, 2025 at 10:17 PM Tiago Bento <ti...@apache.org> wrote:
> Thank you Toshiya! Great initiative. Do you think this PR is enough
> for people doing the same for other docs? Maybe some pointers on how
> you were able to keep the commit history, for example? Thanks!!
>
> On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi
> <to...@gmail.com> wrote:
> >
> > Hi all,
> >
> > I have filed a PR to move incubator-kie-drools/drools-docs under
> > incubator-kie-docs in order to resolve a license issue.
> >
> > https://github.com/apache/incubator-kie-docs/pull/4545
> >
> > Once merged, I will remove drools-docs from incubator-kie-drools:main.
> >
> > This is just a heads-up and I hope it's not something to require a vote.
> >
> > Regards,
> > Toshiya
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
> For additional commands, e-mail: dev-help@kie.apache.org
>
>
Re: [HEADS-UP] drools-docs moves under incubator-kie-docs
Posted by Tiago Bento <ti...@apache.org>.
Thank you Toshiya! Great initiative. Do you think this PR is enough
for people doing the same for other docs? Maybe some pointers on how
you were able to keep the commit history, for example? Thanks!!
On Wed, May 7, 2025 at 3:02 AM Toshiya Kobayashi
<to...@gmail.com> wrote:
>
> Hi all,
>
> I have filed a PR to move incubator-kie-drools/drools-docs under
> incubator-kie-docs in order to resolve a license issue.
>
> https://github.com/apache/incubator-kie-docs/pull/4545
>
> Once merged, I will remove drools-docs from incubator-kie-drools:main.
>
> This is just a heads-up and I hope it's not something to require a vote.
>
> Regards,
> Toshiya
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@kie.apache.org
For additional commands, e-mail: dev-help@kie.apache.org