On Fri, Jan 22, 2021 at 12:14 PM Fabiano Fidêncio <fabiano@fidencio.org> wrote:
>
> Kata Folks,
>
> On Fri, Jan 22, 2021 at 8:29 AM Fabiano Fidêncio <fabiano@fidencio.org> wrote:
> >
> > Kata Folks,
> >
> > On Thu, Jan 21, 2021 at 9:49 AM Fabiano Fidêncio <fabiano@fidencio.org> wrote:
> > >
> > > Kata Folks,
> > >
> > > During the last Architecture Committee meeting it's been decided that
> > > we'd do the following branch name changes:
> > > * kata-containers/kata-containers:
> > >   - "2.0-dev" will be renamed to "main";
> > >   - "stable-2.0.0" will be renamed to "stable-2.0"l
> > > * kata-containers/tests;
> > >   - "2.0-dev" will be renamed to "main";
> > >   - "stable-2.0.0" will be renamed to "stable-2.0"l
> > >
> > > In order to do such changes we'll have to avoid merging patches for a
> > > few hours, if not a whole day (in the worst case scenario), so we can
> > > get our CI working against the now renamed branches.
> > >
> > > We understand it'll cause disruptions not only for the time window
> > > where we won't merge any pull-request, but mainly for the fact that
> > > pull-requests previously opened against "2.0-dev" branches will have
> > > to be reopened, this time against "main", and we apologize in advance.
> > >
> > > Our original plan is to take Tomorrow (January 22nd, 2020) to do the
> > > switch. In case there are any concerns from any member of the
> > > community, please, let us know replying to this email.
> > >
> > > If we get no reply with concerns by Tomorrow we'll go ahead and
> > > proceed with the change.
> > >
> > > Best Regards,
> > > --
> > > Fabiano Fidêncio
> >
> > Peng Tao and I started working on this less than one hours ago, we've
> > commented on all the PRs that will need to be re-opened against `main`
> > or `stable-2.0` about the disruption, we've added `do-not-merge` and
> > `needs-branch-adjustment` labels on them, and we'll comment on them
> > again once this switch is over. You also will receive another email
> > from me once we're done with the switch.
> >
> > Sorry for the disruption and thanks for understanding the situation!
>
> The default branches for both `kata-containers/kata-containers` and
> `kata-containers/tests` repos have been changed to `main` instead of
> `2.0-dev`, and together with this change `stable-2.0.0` has been
> renamed to `stable-2.0`.

A small correction here: `stable-2.0.0` branch was deleted and a new
`stable-2.0` has been created.
The reasoning for that is that only "default" branches can be renamed
and we decided to avoid the shenanigans of setting "stable-2.0.0" to
default, rename it, and set "main" back to the default.

With this, 2 opened PRs have been affected and we've already contacted
the submitters asking them to re-open the PR against the `stable-2.0`
branch.

> Theoretically all the CIs are working, and if you face any issue,
> please, contact us either through this mailing list or on Kata
> Containers Slack (bit.ly/katacontainersslack),
>
> Absolutely **no** changes will be needed for the PRs who were opened
> against the `2.0-dev` branch! I'll be going through the PRs, doing a
> second round of comments during the rest of the afternoon, just to be
> sure everyone gets notified about this.
>
> Thanks for your patience, and a special thanks to Peng Tao for helping
> with the process!

Another thing we'd like to mention is that if you have a local clone
of the repo, you can update it by running:
```
git branch -m 2.0-dev main
git fetch origin
git branch -u origin/main main
```

And those instructions are also being displayed in the repos.

Best Regards,
--
Fabiano Fidêncio

_______________________________________________
kata-dev mailing list
kata-dev@lists.katacontainers.io
http://lists.katacontainers.io/cgi-bin/mailman/listinfo/kata-dev