Hi, I'm new the community, so sorry if I have the wrong context. If the goal is just to rename the branch I believe you can do that automagically now without manual copies and deletes... https://github.com/github/renaming#rename-existing " Renaming a branch will: * Re-target any open pull requests * Update any draft releases based on the branch * Move any branch protection rules that explicitly reference the old name * Update the branch used to build GitHub Pages, if applicable * Show a notice to repository contributors, maintainers, and admins on the repository homepage with instructions to update local copies of the repository * Show a notice to contributors who git push to the old branch * Redirect web requests for the old branch name to the new branch name * Return a "Moved Permanently" response in API requests for the old branch name" Regards, Dan On 7/21/21, 3:32 PM, "Montes, Julio" <julio.montes@intel.com> wrote: Hi kata-folks I'm planning to create a copy of master branch in the govmm[1] repository called main, main will be the principal branch and master will be archived (if this is possible). I will make the changes needed in the kata-containers repository to support the previous change. Please speak up if you see any inconvenience or disagree with that change. Thanks -- Julio [1]: https://github.com/kata-containers/govmm _______________________________________________ kata-dev mailing list kata-dev@lists.katacontainers.io http://lists.katacontainers.io/cgi-bin/mailman/listinfo/kata-dev
Thanks Dan for the pointer! That is useful indeed. Sounds like Julio, instead of creating a copy and archiving the older master branch, you can simply rename using the steps outlined here: https://docs.github.com/en/github/administering-a-repository/managing-branch... -Archana On 7/22/21, 2:17 AM, "Middleton, Dan" <dan.middleton@intel.com> wrote: Hi, I'm new the community, so sorry if I have the wrong context. If the goal is just to rename the branch I believe you can do that automagically now without manual copies and deletes... https://github.com/github/renaming#rename-existing " Renaming a branch will: * Re-target any open pull requests * Update any draft releases based on the branch * Move any branch protection rules that explicitly reference the old name * Update the branch used to build GitHub Pages, if applicable * Show a notice to repository contributors, maintainers, and admins on the repository homepage with instructions to update local copies of the repository * Show a notice to contributors who git push to the old branch * Redirect web requests for the old branch name to the new branch name * Return a "Moved Permanently" response in API requests for the old branch name" Regards, Dan On 7/21/21, 3:32 PM, "Montes, Julio" <julio.montes@intel.com> wrote: Hi kata-folks I'm planning to create a copy of master branch in the govmm[1] repository called main, main will be the principal branch and master will be archived (if this is possible). I will make the changes needed in the kata-containers repository to support the previous change. Please speak up if you see any inconvenience or disagree with that change. Thanks -- Julio [1]: https://github.com/kata-containers/govmm _______________________________________________ kata-dev mailing list kata-dev@lists.katacontainers.io http://lists.katacontainers.io/cgi-bin/mailman/listinfo/kata-dev _______________________________________________ kata-dev mailing list kata-dev@lists.katacontainers.io http://lists.katacontainers.io/cgi-bin/mailman/listinfo/kata-dev
Thanks Dan and Archana, right now we have both master and main in all repositories (i.e https://github.com/kata-containers/kata-containers/tree/master), so I wanted to have the same "template" in the govmm repository. my question is, should we get rid of the master branch? IMHO, yes but I'd like to see what do you (community) think... Thanks -- Julio On Thu, 2021-07-22 at 08:18 +0000, Shinde, Archana M wrote:
Thanks Dan for the pointer! That is useful indeed. Sounds like Julio, instead of creating a copy and archiving the older master branch, you can simply rename using the steps outlined here: https://docs.github.com/en/github/administering-a-repository/managing-branch...
-Archana
On 7/22/21, 2:17 AM, "Middleton, Dan" <dan.middleton@intel.com> wrote:
Hi, I'm new the community, so sorry if I have the wrong context. If the goal is just to rename the branch I believe you can do that automagically now without manual copies and deletes... https://github.com/github/renaming#rename-existing " Renaming a branch will: * Re-target any open pull requests * Update any draft releases based on the branch * Move any branch protection rules that explicitly reference the old name * Update the branch used to build GitHub Pages, if applicable * Show a notice to repository contributors, maintainers, and admins on the repository homepage with instructions to update local copies of the repository * Show a notice to contributors who git push to the old branch * Redirect web requests for the old branch name to the new branch name * Return a "Moved Permanently" response in API requests for the old branch name"
Regards, Dan
On 7/21/21, 3:32 PM, "Montes, Julio" <julio.montes@intel.com> wrote:
Hi kata-folks
I'm planning to create a copy of master branch in the govmm[1] repository called main, main will be the principal branch and master will be archived (if this is possible). I will make the changes needed in the kata-containers repository to support the previous change.
Please speak up if you see any inconvenience or disagree with that change.
Thanks
-- Julio
[1]: https://github.com/kata-containers/govmm _______________________________________________ kata-dev mailing list kata-dev@lists.katacontainers.io
http://lists.katacontainers.io/cgi-bin/mailman/listinfo/kata-dev
_______________________________________________ kata-dev mailing list kata-dev@lists.katacontainers.io http://lists.katacontainers.io/cgi-bin/mailman/listinfo/kata-dev
On 22 Jul 2021, at 15:14, Montes, Julio <julio.montes@intel.com> wrote:
Thanks Dan and Archana, right now we have both master and main in all repositories (i.e https://github.com/kata-containers/kata-containers/tree/master), so I wanted to have the same "template" in the govmm repository.
my question is, should we get rid of the master branch?
It looks like main should have been renamed earlier, and we just did not know. As long as master is a strict subset of main, there is just no reason to keep it around.
IMHO, yes but I'd like to see what do you (community) think...
Thanks
-- Julio
On Thu, 2021-07-22 at 08:18 +0000, Shinde, Archana M wrote:
Thanks Dan for the pointer! That is useful indeed. Sounds like Julio, instead of creating a copy and archiving the older master branch, you can simply rename using the steps outlined here: https://docs.github.com/en/github/administering-a-repository/managing-branch...
-Archana
On 7/22/21, 2:17 AM, "Middleton, Dan" <dan.middleton@intel.com> wrote:
Hi, I'm new the community, so sorry if I have the wrong context. If the goal is just to rename the branch I believe you can do that automagically now without manual copies and deletes... https://github.com/github/renaming#rename-existing " Renaming a branch will: * Re-target any open pull requests * Update any draft releases based on the branch * Move any branch protection rules that explicitly reference the old name * Update the branch used to build GitHub Pages, if applicable * Show a notice to repository contributors, maintainers, and admins on the repository homepage with instructions to update local copies of the repository * Show a notice to contributors who git push to the old branch * Redirect web requests for the old branch name to the new branch name * Return a "Moved Permanently" response in API requests for the old branch name"
Regards, Dan
On 7/21/21, 3:32 PM, "Montes, Julio" <julio.montes@intel.com> wrote:
Hi kata-folks
I'm planning to create a copy of master branch in the govmm[1] repository called main, main will be the principal branch and master will be archived (if this is possible). I will make the changes needed in the kata-containers repository to support the previous change.
Please speak up if you see any inconvenience or disagree with that change.
Thanks
-- Julio
[1]: https://github.com/kata-containers/govmm _______________________________________________ kata-dev mailing list kata-dev@lists.katacontainers.io
http://lists.katacontainers.io/cgi-bin/mailman/listinfo/kata-dev
_______________________________________________ kata-dev mailing list kata-dev@lists.katacontainers.io http://lists.katacontainers.io/cgi-bin/mailman/listinfo/kata-dev
_______________________________________________ kata-dev mailing list kata-dev@lists.katacontainers.io http://lists.katacontainers.io/cgi-bin/mailman/listinfo/kata-dev
On Thu, Jul 22, 2021 at 3:15 PM Montes, Julio <julio.montes@intel.com> wrote:
Thanks Dan and Archana, right now we have both master and main in all repositories (i.e https://github.com/kata-containers/kata-containers/tree/master), so I wanted to have the same "template" in the govmm repository.
my question is, should we get rid of the master branch?
I've raised this in the past and I sincerely think we should get rid of them. The reason we have `master` on the tests repo, is because that's what was used with 1.x. Now 1.x reached its EOL and we can get rid of that without much problems, but I'd recommend: * Branching from master to something like `1.x-eol` branch. * Remove the master branch then. The reason we have `master` on the kata-containers repo, is because at some point (before 2.x had an official release, and while 1.x was still alive) we published releases on the `master` branch. There we need to ensure this is not done anymore (and I sincerely don't think it's) and then we can simply get rid of that, even without snapshotting that branch. Best Regards, -- Fabiano Fidêncio
participants (5)
-
Christophe de Dinechin
-
Fabiano Fidêncio
-
Middleton, Dan
-
Montes, Julio
-
Shinde, Archana M